* elf-m10200.c: Rename from elf32-mn10200.c.

	* elf-m10300.c: Rename from elf32-mn10300.c.
	* cpu-m10200.c: Rename from cpu-mn10200.c
	* cpu-m10300.c: Rename from cpu-mn10300.c
	* Makefile.in: Update accordingly.

6 files changed, 10 insertions, 503 deletions

diff --git a/bfd/.Sanitize b/bfd/.Sanitize
index 4d6fdf9..f0eb629 100644
--- a/bfd/.Sanitize
+++ b/bfd/.Sanitize
@@ -140,8 +140,8 @@ cpu-m32r.c
 cpu-m68k.c
 cpu-m88k.c
 cpu-mips.c
-cpu-mn10200.c
-cpu-mn10300.c
+cpu-m10200.c
+cpu-m10300.c
 cpu-ns32k.c
 cpu-powerpc.c
 cpu-rs6000.c
@@ -169,8 +169,8 @@ elf32-m32r.c
 elf32-m68k.c
 elf32-m88k.c
 elf32-mips.c
-elf32-mn10200.c
-elf32-mn10300.c
+elf-m10200.c
+elf-m10300.c
 elf32-ppc.c
 elf32-sh.c
 elf32-sparc.c
diff --git a/bfd/ChangeLog b/bfd/ChangeLog
index a7dd53b..40541f9 100644
--- a/bfd/ChangeLog
+++ b/bfd/ChangeLog
@@ -1,5 +1,11 @@
 Wed Apr  2 10:49:07 1997  Ian Lance Taylor  <ian@cygnus.com>
 
+	* elf-m10200.c: Rename from elf32-mn10200.c.
+	* elf-m10300.c: Rename from elf32-mn10300.c.
+	* cpu-m10200.c: Rename from cpu-mn10200.c
+	* cpu-m10300.c: Rename from cpu-mn10300.c
+	* Makefile.in: Update accordingly.
+
 	* elf32-mips.c (elf_mips_ctor64_howto): New static variable.
 	(elf_mips_isa): Move to earlier in file.
 	(mips_reloc_map): Remove BFD_RELOC_CTOR entry.
diff --git a/bfd/cpu-mn10200.c b/bfd/cpu-m10200.c
index 3f8a678..3f8a678 100644
--- a/bfd/cpu-mn10200.c
+++ b/bfd/cpu-m10200.c
diff --git a/bfd/cpu-mn10300.c b/bfd/cpu-mn10300.c
deleted file mode 100644
index c40457c..0000000
--- a/bfd/cpu-mn10300.c
+++ /dev/null
@@ -1,38 +0,0 @@
-/* BFD support for the Matsushita 10300 processor
-   Copyright 1996, 1997 Free Software Foundation, Inc.
-
-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 2 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., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.  */
-
-#include "bfd.h"
-#include "sysdep.h"
-#include "libbfd.h"
-
-const bfd_arch_info_type bfd_mn10300_arch =
-  {
-    32, /* 16 bits in a word */
-    32, /* 16 bits in an address */
-    8,  /* 8 bits in a byte */
-    bfd_arch_mn10300,
-    300,
-    "mn10300",
-    "mn10300",
-    2,
-    true, /* the one and only */
-    bfd_default_compatible,
-    bfd_default_scan ,
-    0,
-  };
diff --git a/bfd/elf32-mn10200.c b/bfd/elf-m10200.c
index 6f3e64f..6f3e64f 100644
--- a/bfd/elf32-mn10200.c
+++ b/bfd/elf-m10200.c
diff --git a/bfd/elf32-mn10300.c b/bfd/elf32-mn10300.c
deleted file mode 100644
index 2f70efe..0000000
--- a/bfd/elf32-mn10300.c
+++ /dev/null
@@ -1,461 +0,0 @@
-/* Matsushita 10300 specific support for 32-bit ELF
-   Copyright (C) 1996, 1997 Free Software Foundation, Inc.
-
-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 2 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., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.  */
-
-#include "bfd.h"
-#include "sysdep.h"
-#include "libbfd.h"
-#include "elf-bfd.h"
-
-static reloc_howto_type *bfd_elf32_bfd_reloc_type_lookup
-  PARAMS ((bfd *abfd, bfd_reloc_code_real_type code));
-static void mn10300_info_to_howto
-  PARAMS ((bfd *, arelent *, Elf32_Internal_Rela *));
-static bfd_reloc_status_type bfd_elf32_mn10300_reloc
-  PARAMS ((bfd *, arelent *, asymbol *, PTR, asection *, bfd *, char **));
-
-
-/* We have to use RELA instructions since md_apply_fix3 in the assembler
-   does absolutely nothing.  */
-#define USE_RELA
-
-enum reloc_type
-{
-  R_MN10300_NONE = 0,
-  R_MN10300_32,
-  R_MN10300_16,
-  R_MN10300_8,
-  R_MN10300_PCREL32,
-  R_MN10300_PCREL16,
-  R_MN10300_PCREL8,
-  R_MN10300_MAX
-};
-
-static reloc_howto_type elf_mn10300_howto_table[] =
-{
-  /* Dummy relocation.  Does nothing.  */
-  HOWTO (R_MN10300_NONE,
-	 0,
-	 2,
-	 16,
-	 false,
-	 0,
-	 complain_overflow_bitfield,
-	 bfd_elf_generic_reloc,
-	 "R_MN10300_NONE",
-	 false,
-	 0,
-	 0,
-	 false),
-  /* Standard 32 bit reloc.  */
-  HOWTO (R_MN10300_32,
-	 0,
-	 2,
-	 32,
-	 false,
-	 0,
-	 complain_overflow_bitfield,
-	 bfd_elf_generic_reloc,
-	 "R_MN10300_32",
-	 false,
-	 0xffffffff,
-	 0xffffffff,
-	 false),
-  /* Standard 16 bit reloc.  */
-  HOWTO (R_MN10300_16,
-	 0,
-	 1,
-	 16,
-	 false,
-	 0,
-	 complain_overflow_bitfield,
-	 bfd_elf_generic_reloc,
-	 "R_MN10300_16",
-	 false,
-	 0xffff,
-	 0xffff,
-	 false),
-  /* Standard 8 bit reloc.  */
-  HOWTO (R_MN10300_8,
-	 0,
-	 0,
-	 8,
-	 false,
-	 0,
-	 complain_overflow_bitfield,
-	 bfd_elf_generic_reloc,
-	 "R_MN10300_8",
-	 false,
-	 0xff,
-	 0xff,
-	 false),
-  /* Standard 32bit pc-relative reloc.  */
-  HOWTO (R_MN10300_PCREL32,
-	 0,
-	 2,
-	 32,
-	 true,
-	 0,
-	 complain_overflow_bitfield,
-	 bfd_elf_generic_reloc,
-	 "R_MN10300_PCREL32",
-	 false,
-	 0xffffffff,
-	 0xffffffff,
-	 true),
-  /* Standard 16bit pc-relative reloc.  */
-  HOWTO (R_MN10300_PCREL16,
-	 0,
-	 1,
-	 16,
-	 true,
-	 0,
-	 complain_overflow_bitfield,
-	 bfd_elf_generic_reloc,
-	 "R_MN10300_PCREL16",
-	 false,
-	 0xffff,
-	 0xffff,
-	 true),
-  /* Standard 8 pc-relative reloc.  */
-  HOWTO (R_MN10300_PCREL8,
-	 0,
-	 0,
-	 8,
-	 true,
-	 0,
-	 complain_overflow_bitfield,
-	 bfd_elf_generic_reloc,
-	 "R_MN10300_PCREL8",
-	 false,
-	 0xff,
-	 0xff,
-	 true),
-};
-
-struct mn10300_reloc_map
-{
-  unsigned char bfd_reloc_val;
-  unsigned char elf_reloc_val;
-};
-
-static const struct mn10300_reloc_map mn10300_reloc_map[] =
-{
-  { BFD_RELOC_NONE, R_MN10300_NONE, },
-  { BFD_RELOC_32, R_MN10300_32, },
-  { BFD_RELOC_16, R_MN10300_16, },
-  { BFD_RELOC_8, R_MN10300_8, },
-  { BFD_RELOC_32_PCREL, R_MN10300_PCREL32, },
-  { BFD_RELOC_16_PCREL, R_MN10300_PCREL16, },
-  { BFD_RELOC_8_PCREL, R_MN10300_PCREL8, },
-};
-
-static reloc_howto_type *
-bfd_elf32_bfd_reloc_type_lookup (abfd, code)
-     bfd *abfd;
-     bfd_reloc_code_real_type code;
-{
-  unsigned int i;
-
-  for (i = 0;
-       i < sizeof (mn10300_reloc_map) / sizeof (struct mn10300_reloc_map);
-       i++)
-    {
-      if (mn10300_reloc_map[i].bfd_reloc_val == code)
-	return &elf_mn10300_howto_table[mn10300_reloc_map[i].elf_reloc_val];
-    }
-
-  return NULL;
-}
-
-/* Set the howto pointer for an MN10300 ELF reloc.  */
-
-static void
-mn10300_info_to_howto (abfd, cache_ptr, dst)
-     bfd *abfd;
-     arelent *cache_ptr;
-     Elf32_Internal_Rela *dst;
-{
-  unsigned int r_type;
-
-  r_type = ELF32_R_TYPE (dst->r_info);
-  BFD_ASSERT (r_type < (unsigned int) R_MN10300_MAX);
-  cache_ptr->howto = &elf_mn10300_howto_table[r_type];
-}
-
-/* Perform a relocation as part of a final link.  */
-static bfd_reloc_status_type
-mn10300_elf_final_link_relocate (howto, input_bfd, output_bfd,
-				 input_section, contents, offset, value,
-				 addend, info, sym_sec, is_local)
-     reloc_howto_type *howto;
-     bfd *input_bfd;
-     bfd *output_bfd;
-     asection *input_section;
-     bfd_byte *contents;
-     bfd_vma offset;
-     bfd_vma value;
-     bfd_vma addend;
-     struct bfd_link_info *info;
-     asection *sym_sec;
-     int is_local;
-{
-  unsigned long r_type = howto->type;
-  bfd_byte *hit_data = contents + offset;
-
-  switch (r_type)
-    {
-
-    case R_MN10300_NONE:
-      return bfd_reloc_ok;
-
-    case R_MN10300_32:
-      value += addend;
-      bfd_put_32 (input_bfd, value, hit_data);
-      return bfd_reloc_ok;
-
-    case R_MN10300_16:
-      value += addend;
-
-      if ((long)value > 0x7fff || (long)value < -0x8000)
-	return bfd_reloc_overflow;
-
-      bfd_put_16 (input_bfd, value, hit_data);
-      return bfd_reloc_ok;
-
-    case R_MN10300_8:
-      value += addend;
-
-      if ((long)value > 0x7fff || (long)value < -0x8000)
-	return bfd_reloc_overflow;
-
-      bfd_put_8 (input_bfd, value, hit_data);
-      return bfd_reloc_ok;
-
-    case R_MN10300_PCREL8:
-      value -= (input_section->output_section->vma
-		+ input_section->output_offset);
-      value -= offset;
-      value += addend;
-
-      if ((long)value > 0xff || (long)value < -0x100)
-        return bfd_reloc_overflow;
-
-      bfd_put_8 (input_bfd, value, hit_data);
-      return bfd_reloc_ok;
-
-    case R_MN10300_PCREL16:
-      value -= (input_section->output_section->vma
-		+ input_section->output_offset);
-      value -= offset;
-      value += addend;
-
-      if ((long)value > 0xffff || (long)value < -0x10000)
-        return bfd_reloc_overflow;
-
-      bfd_put_16 (input_bfd, value, hit_data);
-      return bfd_reloc_ok;
-
-    case R_MN10300_PCREL32:
-      value -= (input_section->output_section->vma
-		+ input_section->output_offset);
-      value -= offset;
-      value += addend;
-
-      bfd_put_32 (input_bfd, value, hit_data);
-      return bfd_reloc_ok;
-
-    default:
-      return bfd_reloc_notsupported;
-    }
-}
-
-
-/* Relocate an MN10300 ELF section.  */
-static boolean
-mn10300_elf_relocate_section (output_bfd, info, input_bfd, input_section,
-			      contents, relocs, local_syms, local_sections)
-     bfd *output_bfd;
-     struct bfd_link_info *info;
-     bfd *input_bfd;
-     asection *input_section;
-     bfd_byte *contents;
-     Elf_Internal_Rela *relocs;
-     Elf_Internal_Sym *local_syms;
-     asection **local_sections;
-{
-  Elf_Internal_Shdr *symtab_hdr;
-  struct elf_link_hash_entry **sym_hashes;
-  Elf_Internal_Rela *rel, *relend;
-
-  symtab_hdr = &elf_tdata (input_bfd)->symtab_hdr;
-  sym_hashes = elf_sym_hashes (input_bfd);
-
-  rel = relocs;
-  relend = relocs + input_section->reloc_count;
-  for (; rel < relend; rel++)
-    {
-      int r_type;
-      reloc_howto_type *howto;
-      unsigned long r_symndx;
-      Elf_Internal_Sym *sym;
-      asection *sec;
-      struct elf_link_hash_entry *h;
-      bfd_vma relocation;
-      bfd_reloc_status_type r;
-
-      r_symndx = ELF32_R_SYM (rel->r_info);
-      r_type = ELF32_R_TYPE (rel->r_info);
-      howto = elf_mn10300_howto_table + r_type;
-
-      if (info->relocateable)
-	{
-	  /* This is a relocateable link.  We don't have to change
-             anything, unless the reloc is against a section symbol,
-             in which case we have to adjust according to where the
-             section symbol winds up in the output section.  */
-	  if (r_symndx < symtab_hdr->sh_info)
-	    {
-	      sym = local_syms + r_symndx;
-	      if (ELF_ST_TYPE (sym->st_info) == STT_SECTION)
-		{
-		  sec = local_sections[r_symndx];
-		  rel->r_addend += sec->output_offset + sym->st_value;
-		}
-	    }
-
-	  continue;
-	}
-
-      /* This is a final link.  */
-      h = NULL;
-      sym = NULL;
-      sec = NULL;
-      if (r_symndx < symtab_hdr->sh_info)
-	{
-	  sym = local_syms + r_symndx;
-	  sec = local_sections[r_symndx];
-	  relocation = (sec->output_section->vma
-			+ sec->output_offset
-			+ sym->st_value);
-	}
-      else
-	{
-	  h = sym_hashes[r_symndx - symtab_hdr->sh_info];
-	  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;
-	  if (h->root.type == bfd_link_hash_defined
-	      || h->root.type == bfd_link_hash_defweak)
-	    {
-	      sec = h->root.u.def.section;
-	      relocation = (h->root.u.def.value
-			    + sec->output_section->vma
-			    + sec->output_offset);
-	    }
-	  else if (h->root.type == bfd_link_hash_undefweak)
-	    relocation = 0;
-	  else
-	    {
-	      if (! ((*info->callbacks->undefined_symbol)
-		     (info, h->root.root.string, input_bfd,
-		      input_section, rel->r_offset)))
-		return false;
-	      relocation = 0;
-	    }
-	}
-
-      r = mn10300_elf_final_link_relocate (howto, input_bfd, output_bfd,
-					   input_section,
-					   contents, rel->r_offset,
-					   relocation, rel->r_addend,
-					   info, sec, h == NULL);
-
-      if (r != bfd_reloc_ok)
-	{
-	  const char *name;
-	  const char *msg = (const char *)0;
-
-	  if (h != NULL)
-	    name = h->root.root.string;
-	  else
-	    {
-	      name = (bfd_elf_string_from_elf_section
-		      (input_bfd, symtab_hdr->sh_link, sym->st_name));
-	      if (name == NULL || *name == '\0')
-		name = bfd_section_name (input_bfd, sec);
-	    }
-
-	  switch (r)
-	    {
-	    case bfd_reloc_overflow:
-	      if (! ((*info->callbacks->reloc_overflow)
-		     (info, name, howto->name, (bfd_vma) 0,
-		      input_bfd, input_section, rel->r_offset)))
-		return false;
-	      break;
-
-	    case bfd_reloc_undefined:
-	      if (! ((*info->callbacks->undefined_symbol)
-		     (info, name, input_bfd, input_section,
-		      rel->r_offset)))
-		return false;
-	      break;
-
-	    case bfd_reloc_outofrange:
-	      msg = "internal error: out of range error";
-	      goto common_error;
-
-	    case bfd_reloc_notsupported:
-	      msg = "internal error: unsupported relocation error";
-	      goto common_error;
-
-	    case bfd_reloc_dangerous:
-	      msg = "internal error: dangerous error";
-	      goto common_error;
-
-	    default:
-	      msg = "internal error: unknown error";
-	      /* fall through */
-
-	    common_error:
-	      if (!((*info->callbacks->warning)
-		    (info, msg, name, input_bfd, input_section,
-		     rel->r_offset)))
-		return false;
-	      break;
-	    }
-	}
-    }
-
-  return true;
-}
-
-#define TARGET_LITTLE_SYM	bfd_elf32_mn10300_vec
-#define TARGET_LITTLE_NAME	"elf32-mn10300"
-#define ELF_ARCH		bfd_arch_mn10300
-#define ELF_MACHINE_CODE	EM_CYGNUS_MN10300
-#define ELF_MAXPAGESIZE		0x1000
-
-#define elf_info_to_howto	mn10300_info_to_howto
-#define elf_info_to_howto_rel	0
-#define elf_backend_relocate_section mn10300_elf_relocate_section
-
-#define elf_symbol_leading_char '_'
-
-#include "elf32-target.h"