2007-02-05 Dave Brolley <brolley@redhat.com>

        * readelf.c (dump_relocations): Don't check for
        (rtype == NULL && type == R_RELC).

2007-02-05  Dave Brolley  <brolley@redhat.com>

        * Contribute the following changes:
        2003-10-29  Dave Brolley  <brolley@redhat.com>

        * configure.in: Define SKIP_ZEROES and SKIP_ZEROES_AT_END for mep.
        * configure: Regenerated.

        2001-04-03  Ben Elliston  <bje@redhat.com>

        * readelf.c: Include "elf/mep.h".
        (guess_is_rela): Handle EM_CYGNUS_MEP.
        (get_machine_name): Ditto.
        (dump_relocations): Ditto.

6 files changed, 39 insertions, 2 deletions

diff --git a/binutils/ChangeLog b/binutils/ChangeLog
index 88065288e9a..cd39f656da0 100644
--- a/binutils/ChangeLog
+++ b/binutils/ChangeLog
@@ -1,3 +1,23 @@
+2007-02-05  Dave Brolley  <brolley@redhat.com>
+
+	* readelf.c (dump_relocations): Don't check for
+	(rtype == NULL && type == R_RELC).
+
+2007-02-05  Dave Brolley  <brolley@redhat.com>
+
+	* Contribute the following changes:
+	2003-10-29  Dave Brolley  <brolley@redhat.com>
+
+	* configure.in: Define SKIP_ZEROES and SKIP_ZEROES_AT_END for mep.
+	* configure: Regenerated.
+
+	2001-04-03  Ben Elliston  <bje@redhat.com>
+
+	* readelf.c: Include "elf/mep.h".
+	(guess_is_rela): Handle EM_CYGNUS_MEP.
+	(get_machine_name): Ditto.
+	(dump_relocations): Ditto.
+
 2007-02-02  H.J. Lu  <hongjiu.lu@intel.com>
 
 	* MAINTAINERS: Add a space between H.J. and Lu.
diff --git a/binutils/Makefile.am b/binutils/Makefile.am
index 298908303e1..c5bfbe9c781 100644
--- a/binutils/Makefile.am
+++ b/binutils/Makefile.am
@@ -556,7 +556,8 @@ readelf.o: readelf.c dwarf.h ../bfd/bfd.h $(INCDIR)/ansidecl.h \
   $(INCDIR)/elf/i370.h $(INCDIR)/elf/i860.h $(INCDIR)/elf/i960.h \
   $(INCDIR)/elf/ia64.h $(INCDIR)/elf/ip2k.h $(INCDIR)/elf/iq2000.h \
   $(INCDIR)/elf/m32c.h $(INCDIR)/elf/m32r.h $(INCDIR)/elf/m68k.h \
-  $(INCDIR)/elf/m68hc11.h $(INCDIR)/elf/mcore.h $(INCDIR)/elf/mips.h \
+  $(INCDIR)/elf/m68hc11.h $(INCDIR)/elf/mcore.h \
+  $(INCDIR)/elf/mep.h $(INCDIR)/elf/mips.h \
   $(INCDIR)/elf/mmix.h $(INCDIR)/elf/mn10200.h $(INCDIR)/elf/mn10300.h \
   $(INCDIR)/elf/mt.h $(INCDIR)/elf/msp430.h $(INCDIR)/elf/or32.h \
   $(INCDIR)/elf/pj.h $(INCDIR)/elf/ppc.h $(INCDIR)/elf/ppc64.h \
diff --git a/binutils/Makefile.in b/binutils/Makefile.in
index 02d568bced6..9718f3d4e95 100644
--- a/binutils/Makefile.in
+++ b/binutils/Makefile.in
@@ -1278,7 +1278,8 @@ readelf.o: readelf.c dwarf.h ../bfd/bfd.h $(INCDIR)/ansidecl.h \
   $(INCDIR)/elf/i370.h $(INCDIR)/elf/i860.h $(INCDIR)/elf/i960.h \
   $(INCDIR)/elf/ia64.h $(INCDIR)/elf/ip2k.h $(INCDIR)/elf/iq2000.h \
   $(INCDIR)/elf/m32c.h $(INCDIR)/elf/m32r.h $(INCDIR)/elf/m68k.h \
-  $(INCDIR)/elf/m68hc11.h $(INCDIR)/elf/mcore.h $(INCDIR)/elf/mips.h \
+  $(INCDIR)/elf/m68hc11.h $(INCDIR)/elf/mcore.h \
+  $(INCDIR)/elf/mep.h $(INCDIR)/elf/mips.h \
   $(INCDIR)/elf/mmix.h $(INCDIR)/elf/mn10200.h $(INCDIR)/elf/mn10300.h \
   $(INCDIR)/elf/mt.h $(INCDIR)/elf/msp430.h $(INCDIR)/elf/or32.h \
   $(INCDIR)/elf/pj.h $(INCDIR)/elf/ppc.h $(INCDIR)/elf/ppc64.h \
diff --git a/binutils/configure b/binutils/configure
index 96ccacdcb8f..8cdec2e4a6d 100755
--- a/binutils/configure
+++ b/binutils/configure
@@ -8738,6 +8738,9 @@ do
 	  fi
 	  DLLTOOL_DEFS="$DLLTOOL_DEFS -DDLLTOOL_MCORE_ELF"
 	  ;;
+  	mep-*)
+	  OBJDUMP_DEFS="-DSKIP_ZEROES=256 -DSKIP_ZEROES_AT_END=0"
+	  ;;
 	esac
     fi
 done
diff --git a/binutils/configure.in b/binutils/configure.in
index cd89a4cb192..1ee3885405e 100644
--- a/binutils/configure.in
+++ b/binutils/configure.in
@@ -355,6 +355,9 @@ changequote([,])dnl
 	  fi
 	  DLLTOOL_DEFS="$DLLTOOL_DEFS -DDLLTOOL_MCORE_ELF"
 	  ;;
+  	mep-*)
+	  OBJDUMP_DEFS="-DSKIP_ZEROES=256 -DSKIP_ZEROES_AT_END=0"
+	  ;;
 	esac
     fi
 done
diff --git a/binutils/readelf.c b/binutils/readelf.c
index a4ade9de11b..f1f849fa2a4 100644
--- a/binutils/readelf.c
+++ b/binutils/readelf.c
@@ -112,6 +112,7 @@
 #include "elf/m68k.h"
 #include "elf/m68hc11.h"
 #include "elf/mcore.h"
+#include "elf/mep.h"
 #include "elf/mips.h"
 #include "elf/mmix.h"
 #include "elf/mn10200.h"
@@ -615,6 +616,7 @@ guess_is_rela (unsigned long e_machine)
     case EM_M32C:
     case EM_M32R:
     case EM_MCORE:
+    case EM_CYGNUS_MEP:
     case EM_MMIX:
     case EM_MN10200:
     case EM_CYGNUS_MN10200:
@@ -1167,6 +1169,10 @@ dump_relocations (FILE *file,
 	case EM_BLACKFIN:
 	  rtype = elf_bfin_reloc_type (type);
 	  break;
+
+	case EM_CYGNUS_MEP:
+	  rtype = elf_mep_reloc_type (type);
+	  break;
 	}
 
       if (rtype == NULL)
@@ -1762,6 +1768,7 @@ get_machine_name (unsigned e_machine)
     case EM_NIOS32:		return "Altera Nios";
     case EM_ALTERA_NIOS2:	return "Altera Nios II";
     case EM_XC16X:		return "Infineon Technologies xc16x";
+    case EM_CYGNUS_MEP:         return "Toshiba MeP Media Engine";
     default:
       snprintf (buff, sizeof (buff), _("<unknown>: %x"), e_machine);
       return buff;
@@ -6844,6 +6851,8 @@ get_symbol_type (unsigned int type)
     case STT_FILE:	return "FILE";
     case STT_COMMON:	return "COMMON";
     case STT_TLS:	return "TLS";
+    case STT_RELC:      return "RELC";
+    case STT_SRELC:     return "SRELC";
     default:
       if (type >= STT_LOPROC && type <= STT_HIPROC)
 	{