remove maxq-coff port

14 files changed, 42 insertions, 585 deletions

diff --git a/bfd/ChangeLog b/bfd/ChangeLog
index a08d73b..6d8f791 100644
--- a/bfd/ChangeLog
+++ b/bfd/ChangeLog
@@ -1,3 +1,19 @@
+2010-06-29  Alan Modra  <amodra@gmail.com>
+
+	* cpu-maxq.c: Delete file.
+	* coff-maxq.c: Delete file.
+	* Makefile.am: Remove references to maxq.
+	* archures.c: Likewise.
+	* coffcode.h: Likewise.
+	* configure.in: Likewise.
+	* targets.c: Likewise.
+	* config.bfd: Move maxq from obsolete to removed.
+	* Makefile.in: Regenerate.
+	* bfd-in2.h: Regenerate.
+	* configure: Regenerate.
+	* libbfd.h: Regenerate.
+	* po/SRC-POTFILES.in: Regenerate.
+
 2010-06-28  Alan Modra  <amodra@gmail.com>
 
 	* compress.c (bfd_uncompress_section_contents): Use ATTRIBUTE_UNUSED
diff --git a/bfd/Makefile.am b/bfd/Makefile.am
index 61e89fa..f2ee38f 100644
--- a/bfd/Makefile.am
+++ b/bfd/Makefile.am
@@ -103,7 +103,6 @@ ALL_MACHINES = \
 	cpu-m68hc12.lo \
 	cpu-m68k.lo \
 	cpu-m88k.lo \
-	cpu-maxq.lo \
 	cpu-mcore.lo \
 	cpu-mep.lo \
 	cpu-microblaze.lo \
@@ -176,7 +175,6 @@ ALL_MACHINES_CFILES = \
 	cpu-m68hc12.c \
 	cpu-m68k.c \
 	cpu-m88k.c \
-	cpu-maxq.c \
 	cpu-mcore.c \
 	cpu-mep.c \
 	cpu-microblaze.c \
@@ -240,7 +238,6 @@ BFD32_BACKENDS = \
 	coff-i960.lo \
 	coff-m68k.lo \
 	coff-m88k.lo \
-	coff-maxq.lo \
 	coff-mips.lo \
 	coff-or32.lo \
 	coff-rs6000.lo \
@@ -422,7 +419,6 @@ BFD32_BACKENDS_CFILES = \
 	coff-i960.c \
 	coff-m68k.c \
 	coff-m88k.c \
-	coff-maxq.c \
 	coff-mips.c \
 	coff-or32.c \
 	coff-rs6000.c \
diff --git a/bfd/Makefile.in b/bfd/Makefile.in
index 5b5c821..7f67714 100644
--- a/bfd/Makefile.in
+++ b/bfd/Makefile.in
@@ -400,7 +400,6 @@ ALL_MACHINES = \
 	cpu-m68hc12.lo \
 	cpu-m68k.lo \
 	cpu-m88k.lo \
-	cpu-maxq.lo \
 	cpu-mcore.lo \
 	cpu-mep.lo \
 	cpu-microblaze.lo \
@@ -473,7 +472,6 @@ ALL_MACHINES_CFILES = \
 	cpu-m68hc12.c \
 	cpu-m68k.c \
 	cpu-m88k.c \
-	cpu-maxq.c \
 	cpu-mcore.c \
 	cpu-mep.c \
 	cpu-microblaze.c \
@@ -538,7 +536,6 @@ BFD32_BACKENDS = \
 	coff-i960.lo \
 	coff-m68k.lo \
 	coff-m88k.lo \
-	coff-maxq.lo \
 	coff-mips.lo \
 	coff-or32.lo \
 	coff-rs6000.lo \
@@ -720,7 +717,6 @@ BFD32_BACKENDS_CFILES = \
 	coff-i960.c \
 	coff-m68k.c \
 	coff-m88k.c \
-	coff-maxq.c \
 	coff-mips.c \
 	coff-or32.c \
 	coff-rs6000.c \
@@ -1208,7 +1204,6 @@ distclean-compile:
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/coff-i960.Plo@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/coff-m68k.Plo@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/coff-m88k.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/coff-maxq.Plo@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/coff-mips.Plo@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/coff-or32.Plo@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/coff-rs6000.Plo@am__quote@
@@ -1265,7 +1260,6 @@ distclean-compile:
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/cpu-m68hc12.Plo@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/cpu-m68k.Plo@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/cpu-m88k.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/cpu-maxq.Plo@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/cpu-mcore.Plo@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/cpu-mep.Plo@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/cpu-microblaze.Plo@am__quote@
diff --git a/bfd/archures.c b/bfd/archures.c
index a8a8b9c..0e08571 100644
--- a/bfd/archures.c
+++ b/bfd/archures.c
@@ -417,9 +417,6 @@ DESCRIPTION
 .#define bfd_mach_xc16xs         3
 .  bfd_arch_xtensa,    {* Tensilica's Xtensa cores.  *}
 .#define bfd_mach_xtensa	1
-.   bfd_arch_maxq,     {* Dallas MAXQ 10/20 *}
-.#define bfd_mach_maxq10    10
-.#define bfd_mach_maxq20    20
 .  bfd_arch_z80,
 .#define bfd_mach_z80strict      1 {* No undocumented opcodes.  *}
 .#define bfd_mach_z80            3 {* With ixl, ixh, iyl, and iyh.  *}
@@ -498,7 +495,6 @@ extern const bfd_arch_info_type bfd_m68hc11_arch;
 extern const bfd_arch_info_type bfd_m68hc12_arch;
 extern const bfd_arch_info_type bfd_m68k_arch;
 extern const bfd_arch_info_type bfd_m88k_arch;
-extern const bfd_arch_info_type bfd_maxq_arch;
 extern const bfd_arch_info_type bfd_mcore_arch;
 extern const bfd_arch_info_type bfd_mep_arch;
 extern const bfd_arch_info_type bfd_mips_arch;
@@ -576,7 +572,6 @@ static const bfd_arch_info_type * const bfd_archures_list[] =
     &bfd_m68hc12_arch,
     &bfd_m68k_arch,
     &bfd_m88k_arch,
-    &bfd_maxq_arch,
     &bfd_mcore_arch,
     &bfd_mep_arch,
     &bfd_microblaze_arch,
diff --git a/bfd/bfd-in2.h b/bfd/bfd-in2.h
index 5c42128..f97c67f 100644
--- a/bfd/bfd-in2.h
+++ b/bfd/bfd-in2.h
@@ -2083,9 +2083,6 @@ enum bfd_architecture
 #define bfd_mach_xc16xs         3
   bfd_arch_xtensa,    /* Tensilica's Xtensa cores.  */
 #define bfd_mach_xtensa        1
-   bfd_arch_maxq,     /* Dallas MAXQ 10/20 */
-#define bfd_mach_maxq10    10
-#define bfd_mach_maxq20    20
   bfd_arch_z80,
 #define bfd_mach_z80strict      1 /* No undocumented opcodes.  */
 #define bfd_mach_z80            3 /* With ixl, ixh, iyl, and iyh.  */
diff --git a/bfd/coff-maxq.c b/bfd/coff-maxq.c
deleted file mode 100644
index 94d5237..0000000
--- a/bfd/coff-maxq.c
+++ /dev/null
@@ -1,447 +0,0 @@
-/* BFD back-end for MAXQ COFF binaries.
-   Copyright 2004, 2005, 2006, 2007, 2008  Free Software Foundation, Inc.
-
-   Contributed by Vineet Sharma (vineets@noida.hcltech.com) Inderpreet S.
-   (inderpreetb@noida.hcltech.com)
-
-   HCL Technologies Ltd.
-
-   This file is part of BFD, the Binary File Descriptor library.
-
-   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 3 of the License, 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.  */
-
-#include "sysdep.h"
-#include "bfd.h"
-#include "libbfd.h"
-#include "coff/maxq.h"
-#include "coff/internal.h"
-#include "libcoff.h"
-#include "libiberty.h"
-
-#ifndef MAXQ20
-#define MAXQ20 1
-#endif
-
-#define RTYPE2HOWTO(cache_ptr, dst)                                     \
-  ((cache_ptr)->howto =                                                 \
-   ((dst)->r_type < 48 							\
-    ? howto_table + (((dst)->r_type==47) ? 6: ((dst)->r_type))		\
-    : NULL))
-
-#define COFF_DEFAULT_SECTION_ALIGNMENT_POWER (2)
-
-/* Code to swap in the reloc offset.  */
-#define SWAP_IN_RELOC_OFFSET    H_GET_16
-#define SWAP_OUT_RELOC_OFFSET   H_PUT_16
-
-#define SHORT_JUMP 	        BFD_RELOC_16_PCREL_S2
-#define LONG_JUMP 	        BFD_RELOC_14
-#define ABSOLUTE_ADDR_FOR_DATA  BFD_RELOC_24
-
-/* checks the range of short jump -127 to 128 */
-#define IS_SJUMP_RANGE(x) ((x > -128) && (x < 129))
-#define HIGH_WORD_MASK    0xff00
-#define LOW_WORD_MASK     0x00ff
-
-static long
-get_symbol_value (asymbol *symbol)
-{
-  long relocation = 0;
-
-  if (bfd_is_com_section (symbol->section))
-    relocation = 0;
-  else
-    relocation = symbol->value +
-      symbol->section->output_section->vma + symbol->section->output_offset;
-
-  return relocation;
-}
-
-/* This function performs all the maxq relocations.
-   FIXME:  The handling of the addend in the 'BFD_*'
-   relocations types.  */
-
-static bfd_reloc_status_type
-coff_maxq20_reloc (bfd *      abfd,
-		   arelent *  reloc_entry,
-		   asymbol *  symbol_in,
-		   void *     data,
-		   asection * input_section ATTRIBUTE_UNUSED,
-		   bfd *      output_bfd    ATTRIBUTE_UNUSED,
-		   char **    error_message ATTRIBUTE_UNUSED)
-{
-  unsigned char *addr = NULL;
-  unsigned long x = 0;
-  long call_addr = 0;
-  short addend = 0;
-  long diff = 0;
-
-  /* If this is an undefined symbol, return error.  */
-  if (symbol_in->section == &bfd_und_section
-      && (symbol_in->flags & BSF_WEAK) == 0)
-    return bfd_reloc_continue;
-
-  if (data && reloc_entry)
-    {
-      addr = (unsigned char *) data + reloc_entry->address;
-      call_addr = call_addr - call_addr;
-      call_addr = get_symbol_value (symbol_in);
-
-      /* Over here the value val stores the 8 bit/16 bit value. We will put a 
-         check if we are moving a 16 bit immediate value into an 8 bit
-         register. In that case we will generate a Upper bytes into PFX[0]
-         and move the lower 8 bits as SRC.  */
-
-      switch (reloc_entry->howto->type)
-	{
-	  /* BFD_RELOC_16_PCREL_S2 47 Handles all the relative jumps and
-	     calls Note: Every relative jump or call is in words.  */
-	case SHORT_JUMP:
-	  /* Handle any addend.  */
-	  addend = reloc_entry->addend;
-
-	  if (addend > call_addr || addend > 0)
-	    call_addr = symbol_in->section->output_section->vma + addend;
-	  else if (addend < call_addr && addend > 0)
-	    call_addr = call_addr + addend;
-	  else if (addend < 0)
-	    call_addr = call_addr + addend;
-
-	  diff = ((call_addr << 1) - (reloc_entry->address << 1));
-
-	  if (!IS_SJUMP_RANGE (diff))
-	    {
-	      bfd_perror (_("Can't Make it a Short Jump"));
-	      return bfd_reloc_outofrange;
-	    }
-
-	  x = bfd_get_16 (abfd, addr);
-
-	  x = x & LOW_WORD_MASK;
-	  x = x | (diff << 8);
-	  bfd_put_16 (abfd, (bfd_vma) x, addr);
-
-	  return bfd_reloc_ok;
-
-	case ABSOLUTE_ADDR_FOR_DATA:
-	case LONG_JUMP:
-	  /* BFD_RELOC_14 Handles intersegment or long jumps which might be
-	     from code to code or code to data segment jumps. Note: When this 
-	     fucntion is called by gas the section flags somehow do not
-	     contain the info about the section type(CODE or DATA). Thus the
-	     user needs to evoke the linker after assembling the files
-	     because the Code-Code relocs are word aligned but code-data are
-	     byte aligned.  */
-	  addend = (reloc_entry->addend - reloc_entry->addend);
-
-	  /* Handle any addend.  */
-	  addend = reloc_entry->addend;
-
-	  /* For relocation involving multiple file added becomes zero thus
-	     this fails - check for zero added. In another case when we try
-	     to add a stub to a file the addend shows the offset from the
-	     start od this file.  */
-	  addend = 0;
-
-	  if (!bfd_is_com_section (symbol_in->section) &&
-	      ((symbol_in->flags & BSF_OLD_COMMON) == 0))
-	    {
-	      if (reloc_entry->addend > symbol_in->value)
-		addend = reloc_entry->addend - symbol_in->value;
-
-	      if ((reloc_entry->addend < symbol_in->value)
-		  && (reloc_entry->addend != 0))
-		addend = reloc_entry->addend - symbol_in->value;
-
-	      if (reloc_entry->addend == symbol_in->value)
-		addend = 0;
-	    }
-
-	  if (bfd_is_com_section (symbol_in->section) ||
-	      ((symbol_in->flags & BSF_OLD_COMMON) != 0))
-	    addend = reloc_entry->addend;
-
-	  if (addend < 0
-	      &&  (call_addr < (long) (addend * (-1))))
-	    addend = 0;
-
-	  call_addr += addend;
-
-	  /* FIXME: This check does not work well with the assembler,
-	     linker needs to be run always.  */
-	  if ((symbol_in->section->flags & SEC_CODE) == SEC_CODE)
-	    {
-	      /* Convert it into words.  */
-	      call_addr = call_addr >> 1;
-
-	      if (call_addr > 0xFFFF)	/* Intersegment Jump.  */
-		{
-		  bfd_perror (_("Exceeds Long Jump Range"));
-		  return bfd_reloc_outofrange;
-		}
-	    }
-	  else
-	    {
-	      /* case ABSOLUTE_ADDR_FOR_DATA : Resolves any code-data
-		 segemnt relocs. These are NOT word aligned.  */
-
-	      if (call_addr > 0xFFFF)	/* Intersegment Jump.  */
-		{
-		  bfd_perror (_("Absolute address Exceeds 16 bit Range"));
-		  return bfd_reloc_outofrange;
-		}
-	    }
-
-	  x = bfd_get_32 (abfd, addr);
-
-	  x = (x & 0xFF00FF00);
-	  x = (x | ((call_addr & HIGH_WORD_MASK) >> 8));
-	  x = (x | (call_addr & LOW_WORD_MASK) << 16);
-
-	  bfd_put_32 (abfd, (bfd_vma) x, addr);
-	  return bfd_reloc_ok;
-
-	case BFD_RELOC_8:
-	  addend = (reloc_entry->addend - reloc_entry->addend);
-
-	  if (!bfd_is_com_section (symbol_in->section) &&
-	      ((symbol_in->flags & BSF_OLD_COMMON) == 0))
-	    {
-	      if (reloc_entry->addend > symbol_in->value)
-		addend = reloc_entry->addend - symbol_in->value;
-	      if (reloc_entry->addend < symbol_in->value)
-		addend = reloc_entry->addend - symbol_in->value;
-	      if (reloc_entry->addend == symbol_in->value)
-		addend = 0;
-	    }
-
-	  if (bfd_is_com_section (symbol_in->section) ||
-	      ((symbol_in->flags & BSF_OLD_COMMON) != 0))
-	    addend = reloc_entry->addend;
-
-	  if (addend < 0
-	      && (call_addr < (long) (addend * (-1))))
-	    addend = 0;
-
-	  if (call_addr + addend > 0xFF)
-	    {
-	      bfd_perror (_("Absolute address Exceeds 8 bit Range"));
-	      return bfd_reloc_outofrange;
-	    }
-
-	  x = bfd_get_8 (abfd, addr);
-	  x = x & 0x00;
-	  x = x | (call_addr + addend);
-
-	  bfd_put_8 (abfd, (bfd_vma) x, addr);
-	  return bfd_reloc_ok;
-
-	case BFD_RELOC_16:
-	  addend = (reloc_entry->addend - reloc_entry->addend);
-	  if (!bfd_is_com_section (symbol_in->section) &&
-	      ((symbol_in->flags & BSF_OLD_COMMON) == 0))
-	    {
-	      if (reloc_entry->addend > symbol_in->value)
-		addend = reloc_entry->addend - symbol_in->value;
-
-	      if (reloc_entry->addend < symbol_in->value)
-		addend = reloc_entry->addend - symbol_in->value;
-
-	      if (reloc_entry->addend == symbol_in->value)
-		addend = 0;
-	    }
-
-	  if (bfd_is_com_section (symbol_in->section) ||
-	      ((symbol_in->flags & BSF_OLD_COMMON) != 0))
-	    addend = reloc_entry->addend;
-
-	  if (addend < 0
-	      && (call_addr < (long) (addend * (-1))))
-	    addend = 0;
-
-	  if ((call_addr + addend) > 0xFFFF)
-	    {
-	      bfd_perror (_("Absolute address Exceeds 16 bit Range"));
-	      return bfd_reloc_outofrange;
-	    }
-	  else
-	    {
-	      unsigned short val = (call_addr + addend);
-
-	      x = bfd_get_16 (abfd, addr);
-
-	      /* LE */
-	      x = (x & 0x0000);	/* Flush garbage value.  */
-	      x = val;
-	      if ((symbol_in->section->flags & SEC_CODE) == SEC_CODE)
-		x = x >> 1;	/* Convert it into words.  */
-	    }
-
-	  bfd_put_16 (abfd, (bfd_vma) x, addr);
-	  return bfd_reloc_ok;
-
-	case BFD_RELOC_32:
-	  addend = (reloc_entry->addend - reloc_entry->addend);
-
-	  if (!bfd_is_com_section (symbol_in->section) &&
-	      ((symbol_in->flags & BSF_OLD_COMMON) == 0))
-	    {
-	      if (reloc_entry->addend > symbol_in->value)
-		addend = reloc_entry->addend - symbol_in->value;
-	      if (reloc_entry->addend < symbol_in->value)
-		addend = reloc_entry->addend - symbol_in->value;
-	      if (reloc_entry->addend == symbol_in->value)
-		addend = 0;
-	    }
-
-	  if (bfd_is_com_section (symbol_in->section) ||
-	      ((symbol_in->flags & BSF_OLD_COMMON) != 0))
-	    addend = reloc_entry->addend;
-
-	  if (addend < 0
-	      && (call_addr < (long) (addend * (-1))))
-	    addend = 0;
-
-	  if ((call_addr + addend) < 0)
-	    {
-	      bfd_perror ("Absolute address Exceeds 32 bit Range");
-	      return bfd_reloc_outofrange;
-	    }
-
-	  x = bfd_get_32 (abfd, addr);
-	  x = (x & 0x0000);	/* Flush garbage value.  */
-	  x = call_addr + addend;
-	  if ((symbol_in->section->flags & SEC_CODE) == SEC_CODE)
-	    x = x >> 1;	/* Convert it into words.  */
-
-	  bfd_put_32 (abfd, (bfd_vma) x, addr);
-	  return bfd_reloc_ok;
-
-	default:
-	  bfd_perror (_("Unrecognized Reloc Type"));
-	  return bfd_reloc_notsupported;
-	}
-    }
-
-  return bfd_reloc_notsupported;
-}
-
-static reloc_howto_type howto_table[] =
-{
-  EMPTY_HOWTO (0),
-  EMPTY_HOWTO (1),
-  {
-   BFD_RELOC_32, 0, 1, 8, FALSE, 0, complain_overflow_bitfield,
-   coff_maxq20_reloc, "32Bit", TRUE, 0x000000ff, 0x000000ff, TRUE
-  },
-  {
-   SHORT_JUMP, 0, 1, 8, FALSE, 0, complain_overflow_bitfield,
-   coff_maxq20_reloc, "SHORT_JMP", TRUE, 0x000000ff, 0x000000ff, TRUE
-  },
-  {
-   ABSOLUTE_ADDR_FOR_DATA, 0, 2, 32, FALSE, 0, complain_overflow_bitfield,
-   coff_maxq20_reloc, "INTERSEGMENT_RELOC", TRUE, 0x00000000, 0x00000000,
-   FALSE
-  },
-  {
-   BFD_RELOC_16, 0, 1, 8, FALSE, 0, complain_overflow_bitfield,
-   coff_maxq20_reloc, "16Bit", TRUE, 0x000000ff, 0x000000ff, TRUE
-  },
-  {
-   LONG_JUMP, 0, 2, 32, FALSE, 0, complain_overflow_bitfield,
-   coff_maxq20_reloc, "LONG_JUMP", TRUE, 0x00000000, 0x00000000, FALSE
-  },
-  {
-   BFD_RELOC_8, 0, 1, 8, FALSE, 0, complain_overflow_bitfield,
-   coff_maxq20_reloc, "8bit", TRUE, 0x000000ff, 0x000000ff, TRUE
-  },
-  EMPTY_HOWTO (8),
-  EMPTY_HOWTO (9),
-  EMPTY_HOWTO (10),
-};
-
-static reloc_howto_type *
-maxq_reloc_type_lookup (bfd * abfd ATTRIBUTE_UNUSED,
-			bfd_reloc_code_real_type code)
-{
-  switch (code)
-    {
-      /* SHORT JUMP */
-    case BFD_RELOC_16_PCREL_S2:
-      return howto_table + 3;
-      
-      /* INTERSEGMENT JUMP */
-    case BFD_RELOC_24:
-      return howto_table + 4;
-      
-      /* BYTE RELOC */
-    case BFD_RELOC_8:
-      return howto_table + 7;
-      
-      /* WORD RELOC */
-    case BFD_RELOC_16:
-      return howto_table + 5;
-      
-      /* LONG RELOC */
-    case BFD_RELOC_32:
-      return howto_table + 2;
-      
-      /* LONG JUMP */
-    case BFD_RELOC_14:
-      return howto_table + 6;
-      
-    default:
-      return NULL;
-    }
-}
-
-static reloc_howto_type *
-maxq_reloc_name_lookup (bfd *abfd ATTRIBUTE_UNUSED, const char *r_name)
-{
-  unsigned int i;
-
-  for (i = 0; i < sizeof (howto_table) / sizeof (howto_table[0]); i++)
-    if (howto_table[i].name != NULL
-	&& strcasecmp (howto_table[i].name, r_name) == 0)
-      return &howto_table[i];
-
-  return NULL;
-}
-
-#define coff_bfd_reloc_type_lookup maxq_reloc_type_lookup
-#define coff_bfd_reloc_name_lookup maxq_reloc_name_lookup
-
-/* Perform any necessary magic to the addend in a reloc entry.  */
-#define CALC_ADDEND(abfd, symbol, ext_reloc, cache_ptr) \
- cache_ptr->addend =  ext_reloc.r_offset;
-
-#ifndef bfd_pe_print_pdata
-#define bfd_pe_print_pdata	NULL
-#endif
-
-#include "coffcode.h"
-
-#ifndef TARGET_UNDERSCORE
-#define TARGET_UNDERSCORE 1
-#endif
-
-#ifndef EXTRA_S_FLAGS
-#define EXTRA_S_FLAGS 0
-#endif
-
-/* Forward declaration for use initialising alternative_target field.  */
-CREATE_LITTLE_COFF_TARGET_VEC (maxqcoff_vec, "coff-maxq", 0, EXTRA_S_FLAGS,
-			       TARGET_UNDERSCORE, NULL, COFF_SWAP_TABLE);
-
diff --git a/bfd/coffcode.h b/bfd/coffcode.h
index 734dde9..ad35e32 100644
--- a/bfd/coffcode.h
+++ b/bfd/coffcode.h
@@ -2094,22 +2094,6 @@ coff_set_arch_mach_hook (bfd *abfd, void * filehdr)
       machine = bfd_mach_m68020;
       break;
 #endif
-#ifdef MAXQ20MAGIC
-    case MAXQ20MAGIC:
-      arch = bfd_arch_maxq;
-      switch (internal_f->f_flags & F_MACHMASK)
-	{
-	case F_MAXQ10:
-	  machine = bfd_mach_maxq10;
-	  break;
-	case F_MAXQ20:
-	  machine = bfd_mach_maxq20;
-	  break;
-	default:
-	  return FALSE;
-	}
-      break;
-#endif
 #ifdef MC88MAGIC
     case MC88MAGIC:
     case MC88DMAGIC:
@@ -3018,17 +3002,6 @@ coff_set_flags (bfd * abfd,
       return TRUE;
 #endif
 
-#ifdef MAXQ20MAGIC
-    case bfd_arch_maxq:
-      * magicp = MAXQ20MAGIC;
-      switch (bfd_get_mach (abfd))
-	{
-	case bfd_mach_maxq10: * flagsp = F_MAXQ10; return TRUE;
-	case bfd_mach_maxq20: * flagsp = F_MAXQ20; return TRUE;
-	default:	      return FALSE;
-	}
-#endif
-
     default:			/* Unknown architecture.  */
       /* Fall through to "return FALSE" below, to avoid
 	 "statement never reached" errors on the one below.  */
@@ -4111,11 +4084,6 @@ coff_write_object_contents (bfd * abfd)
     internal_a.magic = NMAGIC; /* Assume separate i/d.  */
 #endif
 
-#ifdef MAXQ20MAGIC
-#define __A_MAGIC_SET__
-      internal_a.magic = MAXQ20MAGIC;
-#endif
-
 #ifndef __A_MAGIC_SET__
 #include "Your aouthdr magic number is not being set!"
 #else
diff --git a/bfd/config.bfd b/bfd/config.bfd
index b25b2fa..1015f3c 100644
--- a/bfd/config.bfd
+++ b/bfd/config.bfd
@@ -31,7 +31,6 @@ targ_underscore=no
 
 # Catch obsolete configurations.
 case $targ in
- maxq-*-coff | \
  null)
     if test "x$enable_obsolete" != xyes; then
       echo "*** Configuration $targ is obsolete." >&2
@@ -47,6 +46,7 @@ case $targ in
  m68*-apollo-* | \
  m68*-bull-sysv* | \
  m68*-*-rtemscoff* | \
+ maxq-*-coff | \
  i960-*-rtems* | \
  or32-*-rtems* | \
  m68*-*-lynxos* | \
@@ -90,7 +90,6 @@ m6811*|m68hc11*) targ_archs="bfd_m68hc11_arch bfd_m68hc12_arch" ;;
 m6812*|m68hc12*) targ_archs="bfd_m68hc12_arch bfd_m68hc11_arch" ;;
 m68*)		 targ_archs=bfd_m68k_arch ;;
 m88*)		 targ_archs=bfd_m88k_arch ;;
-maxq*)		 targ_archs=bfd_maxq_arch ;;
 microblaze*)	 targ_archs=bfd_microblaze_arch ;;
 mips*)		 targ_archs=bfd_mips_arch ;;
 or32*)		 targ_archs=bfd_or32_arch ;;
@@ -880,10 +879,6 @@ case "${targ}" in
     targ_underscore=yes
     ;;
 
-  maxq-*-coff)
-    targ_defvec=maxqcoff_vec
-    ;;
-
   mcore-*-elf)
     targ_defvec=bfd_elf32_mcore_big_vec
     targ_selvecs="bfd_elf32_mcore_big_vec bfd_elf32_mcore_little_vec"
diff --git a/bfd/configure b/bfd/configure
index 04c6989..51a4158 100755
--- a/bfd/configure
+++ b/bfd/configure
@@ -2138,8 +2138,10 @@ $as_echo "$ac_res" >&6; }
 ac_fn_c_check_decl ()
 {
   as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack
-  { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether $2 is declared" >&5
-$as_echo_n "checking whether $2 is declared... " >&6; }
+  as_decl_name=`echo $2|sed 's/ *(.*//'`
+  as_decl_use=`echo $2|sed -e 's/(/((/' -e 's/)/) 0&/' -e 's/,/) 0& (/g'`
+  { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether $as_decl_name is declared" >&5
+$as_echo_n "checking whether $as_decl_name is declared... " >&6; }
 if { as_var=$3; eval "test \"\${$as_var+set}\" = set"; }; then :
   $as_echo_n "(cached) " >&6
 else
@@ -2149,8 +2151,12 @@ $4
 int
 main ()
 {
-#ifndef $2
-  (void) $2;
+#ifndef $as_decl_name
+#ifdef __cplusplus
+  (void) $as_decl_use;
+#else
+  (void) $as_decl_name;
+#endif
 #endif
 
   ;
@@ -11406,7 +11412,7 @@ else
   lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
   lt_status=$lt_dlunknown
   cat > conftest.$ac_ext <<_LT_EOF
-#line 11409 "configure"
+#line 11415 "configure"
 #include "confdefs.h"
 
 #if HAVE_DLFCN_H
@@ -11512,7 +11518,7 @@ else
   lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
   lt_status=$lt_dlunknown
   cat > conftest.$ac_ext <<_LT_EOF
-#line 11515 "configure"
+#line 11521 "configure"
 #include "confdefs.h"
 
 #if HAVE_DLFCN_H
@@ -15239,7 +15245,6 @@ do
     m88kbcs_vec)		tb="$tb coff-m88k.lo" ;;
     m88kmach3_vec)		tb="$tb m88kmach3.lo aout32.lo" ;;
     m88kopenbsd_vec)		tb="$tb m88kopenbsd.lo aout32.lo" ;;
-    maxqcoff_vec)               tb="$tb coff-maxq.lo" ;;
     mach_o_be_vec)              tb="$tb mach-o.lo" ;;
     mach_o_le_vec)              tb="$tb mach-o.lo" ;;
     mach_o_fat_vec)             tb="$tb mach-o.lo" ;;
diff --git a/bfd/configure.in b/bfd/configure.in
index 65ae8d3..13fb66f 100644
--- a/bfd/configure.in
+++ b/bfd/configure.in
@@ -876,7 +876,6 @@ do
     m88kbcs_vec)		tb="$tb coff-m88k.lo" ;;
     m88kmach3_vec)		tb="$tb m88kmach3.lo aout32.lo" ;;
     m88kopenbsd_vec)		tb="$tb m88kopenbsd.lo aout32.lo" ;;
-    maxqcoff_vec)               tb="$tb coff-maxq.lo" ;;
     mach_o_be_vec)              tb="$tb mach-o.lo" ;;
     mach_o_le_vec)              tb="$tb mach-o.lo" ;;
     mach_o_fat_vec)             tb="$tb mach-o.lo" ;;
diff --git a/bfd/cpu-maxq.c b/bfd/cpu-maxq.c
deleted file mode 100644
index 8340788..0000000
--- a/bfd/cpu-maxq.c
+++ /dev/null
@@ -1,60 +0,0 @@
-/* BFD support for the MAXQ20/10 architecture.
-   Copyright 2004, 2005, 2007 Free Software Foundation, Inc.
-
-   Written by Vineet Sharma(vineets@noida.hcltech.com)
-	      Inderpreet Singh(inderpreetb@noida.hcltech.com)		
-
-   This file is part of BFD, the Binary File Descriptor library.
-
-   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 3 of the License, 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.  */
-
-#include "sysdep.h"
-#include "bfd.h"
-#include "libbfd.h"
-
-/* MAXQ Archtecture info.  */
-static const bfd_arch_info_type bfd_maxq10_arch =
-{
-  16,				/* 16 bits in a word.  */
-  16,				/* 16 bits in an address.  */
-  8,				/* 16 bits in a byte.  */
-  bfd_arch_maxq,		/* Architecture number.  */
-  bfd_mach_maxq10,		/* Machine number.  */
-  "maxq",			/* Architecture name.  */
-  "maxq10",			/* Machine name.  */
-  0,				/* Section align power.  */
-  FALSE,			/* Not the default machine.  */
-  bfd_default_compatible,
-  bfd_default_scan,
-  NULL
-};
-
-
-const bfd_arch_info_type bfd_maxq_arch =
-{
-  16,				/* 16 bits in a word.  */
-  16,				/* 16 bits in an address.  */
-  8,				/* 16 bits in a byte.  */
-  bfd_arch_maxq,		/* Architecture number.  */
-  bfd_mach_maxq20,		/* Machine number.  */
-  "maxq",			/* Architecture name.  */
-  "maxq20",			/* Machine name.  */
-  0,				/* Section align power.  */
-  TRUE,				/* This is the default machine.  */
-  bfd_default_compatible,
-  bfd_default_scan,
-  & bfd_maxq10_arch
-};
diff --git a/bfd/libbfd.h b/bfd/libbfd.h
index 233891c..3da79d9 100644
--- a/bfd/libbfd.h
+++ b/bfd/libbfd.h
@@ -2243,12 +2243,12 @@ bfd_boolean bfd_generic_merge_sections
    (bfd *, struct bfd_link_info *);
 
 bfd_byte *bfd_generic_get_relocated_section_contents
-   (bfd *,
-    struct bfd_link_info *,
-    struct bfd_link_order *,
-    bfd_byte *,
-    bfd_boolean,
-    asymbol **);
+   (bfd *abfd,
+    struct bfd_link_info *link_info,
+    struct bfd_link_order *link_order,
+    bfd_byte *data,
+    bfd_boolean relocatable,
+    asymbol **symbols);
 
 /* Extracted from archures.c.  */
 extern const bfd_arch_info_type bfd_default_arch_struct;
diff --git a/bfd/po/SRC-POTFILES.in b/bfd/po/SRC-POTFILES.in
index 8f39698..729b704 100644
--- a/bfd/po/SRC-POTFILES.in
+++ b/bfd/po/SRC-POTFILES.in
@@ -37,7 +37,6 @@ coff-i860.c
 coff-i960.c
 coff-m68k.c
 coff-m88k.c
-coff-maxq.c
 coff-mips.c
 coff-or32.c
 coff-rs6000.c
@@ -96,7 +95,6 @@ cpu-m68hc11.c
 cpu-m68hc12.c
 cpu-m68k.c
 cpu-m88k.c
-cpu-maxq.c
 cpu-mcore.c
 cpu-mep.c
 cpu-microblaze.c
@@ -113,6 +111,7 @@ cpu-pj.c
 cpu-plugin.c
 cpu-powerpc.c
 cpu-rs6000.c
+cpu-rx.c
 cpu-s390.c
 cpu-score.c
 cpu-sh.c
@@ -121,6 +120,7 @@ cpu-spu.c
 cpu-tic30.c
 cpu-tic4x.c
 cpu-tic54x.c
+cpu-tic6x.c
 cpu-tic80.c
 cpu-v850.c
 cpu-vax.c
@@ -190,6 +190,7 @@ elf32-openrisc.c
 elf32-or32.c
 elf32-pj.c
 elf32-ppc.c
+elf32-rx.c
 elf32-s390.c
 elf32-score.c
 elf32-score7.c
@@ -199,6 +200,7 @@ elf32-sh64-com.c
 elf32-sh64.c
 elf32-sparc.c
 elf32-spu.c
+elf32-tic6x.c
 elf32-v850.c
 elf32-vax.c
 elf32-xc16x.c
@@ -266,6 +268,7 @@ m68knetbsd.c
 m88kmach3.c
 m88kopenbsd.c
 mach-o-i386.c
+mach-o-x86-64.c
 mach-o.c
 mach-o.h
 merge.c
@@ -338,11 +341,9 @@ vaxnetbsd.c
 verilog.c
 versados.c
 version.h
-vms-gsd.c
-vms-hdr.c
+vms-alpha.c
+vms-lib.c
 vms-misc.c
-vms-tir.c
-vms.c
 vms.h
 xcoff-target.h
 xcofflink.c
diff --git a/bfd/targets.c b/bfd/targets.c
index 8e0fafe..bb20189 100644
--- a/bfd/targets.c
+++ b/bfd/targets.c
@@ -769,7 +769,6 @@ extern const bfd_target mach_o_le_vec;
 extern const bfd_target mach_o_fat_vec;
 extern const bfd_target mach_o_i386_vec;
 extern const bfd_target mach_o_x86_64_vec;
-extern const bfd_target maxqcoff_vec;
 extern const bfd_target mcore_pe_big_vec;
 extern const bfd_target mcore_pe_little_vec;
 extern const bfd_target mcore_pei_big_vec;
@@ -1152,7 +1151,6 @@ static const bfd_target * const _bfd_target_vector[] =
 #ifdef BFD64
 	&mach_o_x86_64_vec,
 #endif
-	&maxqcoff_vec,
 	&mcore_pe_big_vec,
 	&mcore_pe_little_vec,
 	&mcore_pei_big_vec,