This commit was manufactured by cvs2svn to create branch 'binutils-binutils-2_14-branchpoint

2_14-branch'.

Sprout from kettenis_i386newframe-20030419-branch 2003-04-19 00:19:41 UTC cvs2svn 'This commit was manufactured by cvs2svn to create branch'
Cherrypick from master 2003-04-24 12:36:08 UTC Nick Clifton <nickc@redhat.com> 'Add support for h8300hn and h8300sn':
    config-ml.in
    include/ChangeLog
    include/bfdlink.h
    include/coff/ChangeLog
    include/coff/h8300.h
    include/elf/ChangeLog
    include/elf/common.h
    include/elf/h8.h
Delete:
    djunpack.bat

7 files changed, 40 insertions, 7 deletions

diff --git a/include/ChangeLog b/include/ChangeLog
index 37bf7132a..3d7ec5caa 100644
--- a/include/ChangeLog
+++ b/include/ChangeLog
@@ -1,3 +1,7 @@
+2003-04-23  H.J. Lu <hjl@gnu.org>
+
+	* bfdlink.h (bfd_link_callbacks): Add error_handler.
+
 2003-04-04  Svein E. Seldal  <Svein.Seldal@solidas.com>
 
 	* coff/tic4x.h: Namespace cleanup. Replace s/c4x/tic4x
diff --git a/include/bfdlink.h b/include/bfdlink.h
index c25826207..acb7449e5 100644
--- a/include/bfdlink.h
+++ b/include/bfdlink.h
@@ -481,6 +481,11 @@ struct bfd_link_callbacks
   bfd_boolean (*notice)
     PARAMS ((struct bfd_link_info *, const char *name,
 	     bfd *abfd, asection *section, bfd_vma address));
+  /* A function which is called for reporting a linker error. ID is the
+     error identifier. The remaining input is the same as einfo () in
+     ld.  */
+  bfd_boolean (*error_handler)
+    PARAMS ((int id, const char * fmt, ...));
 };
 
 /* The linker builds link_order structures which tell the code how to
diff --git a/include/coff/ChangeLog b/include/coff/ChangeLog
index 353eb5991..b6db3064d 100644
--- a/include/coff/ChangeLog
+++ b/include/coff/ChangeLog
@@ -1,3 +1,8 @@
+2003-04-24 Dhananjay Deshpande <dhananjayd@kpitcummins.com> 
+
+	* coff/h8300.h (H8300HNMAGIC, H8300SNMAGIC): New.
+	(H8300HNBADMAG, H8300SNBADMAG): New.
+
 2003-04-15  Rohit Kumar Srivastava <rohits@kpitcummins.com>
 
 	* sh.h: Replace occurrances of 'Hitachi' with 'Renesas'.
diff --git a/include/coff/h8300.h b/include/coff/h8300.h
index c30dc0097..908848c18 100644
--- a/include/coff/h8300.h
+++ b/include/coff/h8300.h
@@ -22,12 +22,16 @@
 #define	H8300MAGIC	0x8300
 #define	H8300HMAGIC	0x8301
 #define	H8300SMAGIC	0x8302
+#define	H8300HNMAGIC	0x8303
+#define	H8300SNMAGIC	0x8304
 
-#define H8300BADMAG(x)  (((x).f_magic != H8300MAGIC))
-#define H8300HBADMAG(x) (((x).f_magic != H8300HMAGIC))
-#define H8300SBADMAG(x) (((x).f_magic != H8300SMAGIC))
+#define H8300BADMAG(x)   (((x).f_magic != H8300MAGIC))
+#define H8300HBADMAG(x)  (((x).f_magic != H8300HMAGIC))
+#define H8300SBADMAG(x)  (((x).f_magic != H8300SMAGIC))
+#define H8300HNBADMAG(x) (((x).f_magic != H8300HNMAGIC))
+#define H8300SNBADMAG(x) (((x).f_magic != H8300SNMAGIC))
 
-/********************** RELOCATION DIRECTIVES **********************/
+/* Relocation directives.  */
 
 /* The external reloc has an offset field, because some of the reloc
    types on the h8 don't have room in the instruction for the entire
diff --git a/include/elf/ChangeLog b/include/elf/ChangeLog
index b84eac528..945ce63bc 100644
--- a/include/elf/ChangeLog
+++ b/include/elf/ChangeLog
@@ -1,3 +1,16 @@
+2003-04-24 Dhananjay Deshpande <dhananjayd@kpitcummins.com> 
+
+	* elf/h8.h (E_H8_MACH_H8300HN, E_H8_MACH_H8300SN): New
+
+2003-04-23  J"orn Rennecke <joern.rennecke@superh.com>
+
+	* common.h (EM_SH): Amend comment to refer to SuperH.
+
+2003-04-22  Kazuhiro Inaoka  <inaoka.kazuhiro@renesas.com>
+
+	* common.h: Replace references to Mitsubishi M32R with
+	references to Renesas M32R.
+
 2003-04-15  Rohit Kumar Srivastava <rohits@kpitcummins.com>
 
 	* common.h: Replace occurrances of 'Hitachi' with 'Renesas'.
diff --git a/include/elf/common.h b/include/elf/common.h
index 02665b715..ca7934286 100644
--- a/include/elf/common.h
+++ b/include/elf/common.h
@@ -126,7 +126,7 @@
 #define EM_RCE		 39	/* Old name for MCore */
 #define EM_ARM		 40	/* ARM */
 #define EM_OLD_ALPHA	 41	/* Digital Alpha */
-#define EM_SH		 42	/* Renesas (formerly Hitachi) SH */
+#define EM_SH		 42	/* Renesas (formerly Hitachi) / SuperH SH */
 #define EM_SPARCV9	 43	/* SPARC v9 64-bit */
 #define EM_TRICORE	 44	/* Siemens Tricore embedded processor */
 #define EM_ARC		 45	/* ARC Cores */
@@ -172,7 +172,7 @@
 #define EM_D10V		 85	/* Mitsubishi D10V */
 #define EM_D30V		 86	/* Mitsubishi D30V */
 #define EM_V850		 87	/* NEC v850 */
-#define EM_M32R		 88	/* Mitsubishi M32R */
+#define EM_M32R		 88	/* Renesas M32R (formerly Mitsubishi M32R) */
 #define EM_MN10300	 89	/* Matsushita MN10300 */
 #define EM_MN10200	 90	/* Matsushita MN10200 */
 #define EM_PJ		 91	/* picoJava */
diff --git a/include/elf/h8.h b/include/elf/h8.h
index ac9db566a..5fdf62c50 100644
--- a/include/elf/h8.h
+++ b/include/elf/h8.h
@@ -1,5 +1,5 @@
 /* H8300/h8500 ELF support for BFD.
-   Copyright 2001 Free Software Foundation, Inc.
+   Copyright 2001, 2003 Free Software Foundation, Inc.
 
    This file is part of BFD, the Binary File Descriptor library.
 
@@ -92,5 +92,7 @@ END_RELOC_NUMBERS (R_H8_max)
 #define E_H8_MACH_H8300		0x00800000
 #define E_H8_MACH_H8300H	0x00810000
 #define E_H8_MACH_H8300S	0x00820000
+#define E_H8_MACH_H8300HN	0x00830000
+#define E_H8_MACH_H8300SN	0x00840000
 
 #endif