bfd:

        * archures.c (enum bfd_architecture): Amend comment to refer to SuperH.
        * cpu-sh.c: Likewise.
        * elf32-sh.c: Likewise.
        * reloc.c (bfd_reloc_code_real): Likewise.
        * elf32-sh64-com.c: Change comment to refer to SuperH.
        * elf32-sh64.c: Likewise.
        * elf64-sh64.c: Likewise.
        * bfd-in2.h (enum bfd_architecture): Regenerate.
binutils:
        * readelf.c (get_machine_name) <EM_SH>: Amend return value
        to refer to SuperH.
gas:
        * config/tc-sh.c: Amend comment to refer to SuperH.
        * config/tc-sh.h: Likewise.
        (LISTING_HEADER): Amend to refer to SuperH.
        * config/tc-sh64.c: Change comment to refer to SuperH.
        * config/tc-sh64.h (LISTING_HEADER): Change to refer to SuperH.
        * doc/as.texinfo [SH, GENERIC]: Amend / Change to refer to SuperH.
        * doc/c-sh.texi: Amend to refer to SuperH.
        Add SuperH architecture documentation references.
        * doc/c-sh64.texi: Change to refer to SuperH.
include/elf:
        * common.h (EM_SH): Amend comment to refer to SuperH.
ld/testsuite:
        * ld-sh/sh64/crange3-cmpct.rd (Machine): Change to refer to SuperH.
        * ld-sh/sh64/crange3-media.rd (Machine): Likewise.

8 files changed, 35 insertions, 18 deletions

diff --git a/gas/ChangeLog b/gas/ChangeLog
index efa436250ca..ac6ac66ccf3 100644
--- a/gas/ChangeLog
+++ b/gas/ChangeLog
@@ -1,3 +1,15 @@
+2003-04-23  J"orn Rennecke <joern.rennecke@superh.com>
+
+	* config/tc-sh.c: Amend comment to refer to SuperH.
+	* config/tc-sh.h: Likewise.
+	(LISTING_HEADER): Amend to refer to SuperH.
+	* config/tc-sh64.c: Change comment to refer to SuperH.
+	* config/tc-sh64.h (LISTING_HEADER): Change to refer to SuperH.
+	* doc/as.texinfo [SH, GENERIC]: Amend / Change to refer to SuperH.
+	* doc/c-sh.texi: Amend to refer to SuperH.
+	Add SuperH architecture documentation references.
+	* doc/c-sh64.texi: Change to refer to SuperH.
+
 2003-04-23  H.J. Lu <hjl@gnu.org>
 
 	* app.c (do_scrub_chars): More checks for valid labels.
diff --git a/gas/config/tc-sh.c b/gas/config/tc-sh.c
index 1303d234b00..8c58ce3f72c 100644
--- a/gas/config/tc-sh.c
+++ b/gas/config/tc-sh.c
@@ -1,4 +1,4 @@
-/* tc-sh.c -- Assemble code for the Renesas Super-H
+/* tc-sh.c -- Assemble code for the Renesas / SuperH SH
    Copyright 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003
    Free Software Foundation, Inc.
 
diff --git a/gas/config/tc-sh.h b/gas/config/tc-sh.h
index bc619c7d489..9923162b752 100644
--- a/gas/config/tc-sh.h
+++ b/gas/config/tc-sh.h
@@ -101,7 +101,8 @@ extern long md_pcrel_from_section PARAMS ((struct fix *, segT));
 
 #define LISTING_HEADER \
   (!target_big_endian \
-   ? "Renesas Super-H GAS Little Endian" : "Renesas Super-H GAS Big Endian")
+   ? "Renesas / SuperH SH GAS Little Endian" \
+   : "Renesas / SuperH SH GAS Big Endian")
 
 #define md_operand(x)
 
diff --git a/gas/config/tc-sh64.c b/gas/config/tc-sh64.c
index 9b2c9d6eae9..ee63b0eb056 100644
--- a/gas/config/tc-sh64.c
+++ b/gas/config/tc-sh64.c
@@ -1,4 +1,4 @@
-/* tc-sh64.c -- Assemble code for the Renesas Super-H SHcompact and SHmedia.
+/* tc-sh64.c -- Assemble code for the SuperH SH SHcompact and SHmedia.
    Copyright 2000, 2001, 2002, 2003 Free Software Foundation.
 
    This file is part of GAS, the GNU Assembler.
diff --git a/gas/config/tc-sh64.h b/gas/config/tc-sh64.h
index f04f3eca93a..888ad9975c7 100644
--- a/gas/config/tc-sh64.h
+++ b/gas/config/tc-sh64.h
@@ -37,8 +37,8 @@ extern int sh64_max_mem_for_rs_align_code PARAMS ((void));
 #undef  LISTING_HEADER
 #define LISTING_HEADER					\
   (target_big_endian ?					\
-     "Renesas SHcompact/SHmedia Big Endian GAS"		\
-   : "Renesas SHcompact/SHmedia Little Endian GAS")
+     "SuperH SHcompact/SHmedia Big Endian GAS"		\
+   : "SuperH SHcompact/SHmedia Little Endian GAS")
 
 /* We need to record the new frag position after an .align.  */
 extern void sh64_do_align PARAMS ((int, const char *, int, int));
diff --git a/gas/doc/as.texinfo b/gas/doc/as.texinfo
index cdeffd661fd..dd78d68cb0b 100644
--- a/gas/doc/as.texinfo
+++ b/gas/doc/as.texinfo
@@ -1156,8 +1156,10 @@ For information on the H8/500 machine instruction set, see @cite{H8/500
 Series Programming Manual} (Renesas M21T001).
 @end ifset
 @ifset SH
-For information on the Renesas (formerly Hitachi) SH machine instruction set,
-see @cite{SH-Microcomputer User's Manual} (Renesas).
+For information on the Renesas (formerly Hitachi) / SuperH SH machine instruction set,
+see @cite{SH-Microcomputer User's Manual} (Renesas) or
+@cite{SH-4 32-bit CPU Core Architecture} (SuperH) and
+@cite{SuperH (SH) 64-Bit RISC Series} (SuperH).
 @end ifset
 @ifset Z8000
 For information on the Z8000 machine instruction set, see @cite{Z8000 CPU Technical Manual}
@@ -2086,7 +2088,7 @@ is considered a comment and is ignored.  The line comment character is
 @samp{;} for Motorola PowerPC;
 @end ifset
 @ifset SH
-@samp{!} for the Renesas SH;
+@samp{!} for the Renesas / SuperH SH;
 @end ifset
 @ifset SPARC
 @samp{!} on the SPARC;
@@ -2542,7 +2544,7 @@ A letter, to tell @command{@value{AS}} the rest of the number is a flonum.
 @end ignore
 
 On the H8/300, H8/500,
-Renesas SH,
+Renesas / SuperH SH,
 and AMD 29K architectures, the letter must be
 one of the letters @samp{DFPRSX} (in upper or lower case).
 
@@ -2679,7 +2681,7 @@ the task of adjusting mentions of object-file addresses so they refer to
 the proper run-time addresses.
 @ifset H8
 For the H8/300 and H8/500,
-and for the Renesas SH,
+and for the Renesas / SuperH SH,
 @command{@value{AS}} pads sections if needed to
 ensure they end on a word (sixteen bit) boundary.
 @end ifset
@@ -3882,8 +3884,8 @@ required alignment; this can be useful if you want the alignment to be filled
 with no-op instructions when appropriate.
 
 The way the required alignment is specified varies from system to system.
-For the a29k, hppa, m68k, m88k, w65, sparc, Xtensa, and Renesas SH, and i386 using ELF
-format,
+For the a29k, hppa, m68k, m88k, w65, sparc, Xtensa, and Renesas / SuperH SH,
+and i386 using ELF format,
 the first expression is the
 alignment request in bytes.  For example @samp{.align 8} advances
 the location counter until it is a multiple of 8.  If the location counter
@@ -5892,8 +5894,8 @@ subject, see the hardware manufacturer's manual.
 * MSP430-Dependent::		MSP430 Dependent Features
 @end ifset
 @ifset SH
-* SH-Dependent::                Renesas SH Dependent Features
-* SH64-Dependent::              Renesas SH64 Dependent Features
+* SH-Dependent::                Renesas / SuperH SH Dependent Features
+* SH64-Dependent::              SuperH SH64 Dependent Features
 @end ifset
 @ifset PDP11
 * PDP-11-Dependent::            PDP-11 Dependent Features
diff --git a/gas/doc/c-sh.texi b/gas/doc/c-sh.texi
index 30ef85e66e5..79255304697 100644
--- a/gas/doc/c-sh.texi
+++ b/gas/doc/c-sh.texi
@@ -4,7 +4,7 @@
 @c For copying conditions, see the file as.texinfo.
 @page
 @node SH-Dependent
-@chapter Renesas SH Dependent Features
+@chapter Renesas / SuperH SH Dependent Features
 
 @cindex SH support
 @menu
@@ -21,7 +21,7 @@
 @cindex SH options
 @cindex options, SH
 @code{@value{AS}} has following command-line options for the Renesas
-(formerly Hitachi) SH family.
+(formerly Hitachi) / SuperH SH family.
 
 @table @code
 @kindex -little
@@ -183,7 +183,9 @@ with other development tools.
 @cindex mnemonics, SH
 @cindex instruction summary, SH
 For detailed information on the SH machine instruction set, see
-@cite{SH-Microcomputer User's Manual} (Renesas).
+@cite{SH-Microcomputer User's Manual} (Renesas) or
+@cite{SH-4 32-bit CPU Core Architecture} (SuperH) and
+@cite{SuperH (SH) 64-Bit RISC Series} (SuperH).
 
 @code{@value{AS}} implements all the standard SH opcodes.  No additional
 pseudo-instructions are needed on this family.  Note, however, that
diff --git a/gas/doc/c-sh64.texi b/gas/doc/c-sh64.texi
index 9df346c1955..91b1a7b4a24 100644
--- a/gas/doc/c-sh64.texi
+++ b/gas/doc/c-sh64.texi
@@ -3,7 +3,7 @@
 @c For copying conditions, see the file as.texinfo.
 @page
 @node SH64-Dependent
-@chapter Renesas SH64 Dependent Features
+@chapter SuperH SH64 Dependent Features
 
 @cindex SH64 support
 @menu