From ef23021837539a0b98c7761a62f0fb316a82a9de Mon Sep 17 00:00:00 2001 From: Joern Rennecke Date: Wed, 23 Apr 2003 21:09:04 +0000 Subject: [PATCH] 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) : 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. --- bfd/ChangeLog | 11 +++++++++++ bfd/archures.c | 2 +- bfd/bfd-in2.h | 4 ++-- bfd/cpu-sh.c | 2 +- bfd/elf32-sh.c | 2 +- bfd/elf32-sh64-com.c | 2 +- bfd/elf32-sh64.c | 2 +- bfd/elf64-sh64.c | 2 +- bfd/reloc.c | 2 +- binutils/ChangeLog | 3 +++ binutils/readelf.c | 2 +- gas/ChangeLog | 12 ++++++++++++ gas/config/tc-sh.c | 2 +- gas/config/tc-sh.h | 3 ++- gas/config/tc-sh64.c | 2 +- gas/config/tc-sh64.h | 4 ++-- gas/doc/as.texinfo | 20 +++++++++++--------- gas/doc/c-sh.texi | 8 +++++--- gas/doc/c-sh64.texi | 2 +- include/elf/ChangeLog | 4 ++++ include/elf/common.h | 2 +- ld/testsuite/ChangeLog | 5 +++++ ld/testsuite/ld-sh/sh64/crange3-cmpct.rd | 2 +- ld/testsuite/ld-sh/sh64/crange3-media.rd | 2 +- 24 files changed, 71 insertions(+), 31 deletions(-) diff --git a/bfd/ChangeLog b/bfd/ChangeLog index b505c41..e701854 100644 --- a/bfd/ChangeLog +++ b/bfd/ChangeLog @@ -1,3 +1,14 @@ +2003-04-23 J"orn Rennecke + + * 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. + 2003-04-23 Alan Modra From Julien LEMOINE diff --git a/bfd/archures.c b/bfd/archures.c index 1deea6f..2aafa49 100644 --- a/bfd/archures.c +++ b/bfd/archures.c @@ -209,7 +209,7 @@ DESCRIPTION .#define bfd_mach_z8001 1 .#define bfd_mach_z8002 2 . bfd_arch_h8500, {* Renesas H8/500 (formerly Hitachi H8/500) *} -. bfd_arch_sh, {* Renesas SH (formerly Hitachi SH) *} +. bfd_arch_sh, {* Renesas / SuperH SH (formerly Hitachi SH) *} .#define bfd_mach_sh 1 .#define bfd_mach_sh2 0x20 .#define bfd_mach_sh_dsp 0x2d diff --git a/bfd/bfd-in2.h b/bfd/bfd-in2.h index 7a4b781..802d395 100644 --- a/bfd/bfd-in2.h +++ b/bfd/bfd-in2.h @@ -1675,7 +1675,7 @@ enum bfd_architecture #define bfd_mach_z8001 1 #define bfd_mach_z8002 2 bfd_arch_h8500, /* Renesas H8/500 (formerly Hitachi H8/500) */ - bfd_arch_sh, /* Renesas SH (formerly Hitachi SH) */ + bfd_arch_sh, /* Renesas / SuperH SH (formerly Hitachi SH) */ #define bfd_mach_sh 1 #define bfd_mach_sh2 0x20 #define bfd_mach_sh_dsp 0x2d @@ -2598,7 +2598,7 @@ field in the instruction. */ BFD_RELOC_ARM_GOTOFF, BFD_RELOC_ARM_GOTPC, -/* Renesas SH relocs. Not all of these appear in object files. */ +/* Renesas / SuperH SH relocs. Not all of these appear in object files. */ BFD_RELOC_SH_PCDISP8BY2, BFD_RELOC_SH_PCDISP12BY2, BFD_RELOC_SH_IMM4, diff --git a/bfd/cpu-sh.c b/bfd/cpu-sh.c index fc4bf42..e247cb8 100644 --- a/bfd/cpu-sh.c +++ b/bfd/cpu-sh.c @@ -1,4 +1,4 @@ -/* BFD library support routines for the Renesas SH architecture. +/* BFD library support routines for the Renesas / SuperH SH architecture. Copyright 1993, 1994, 1997, 1998, 2000, 2001, 2002, 2003 Free Software Foundation, Inc. Hacked by Steve Chamberlain of Cygnus Support. diff --git a/bfd/elf32-sh.c b/bfd/elf32-sh.c index 8eb9a49..789ee78 100644 --- a/bfd/elf32-sh.c +++ b/bfd/elf32-sh.c @@ -1,4 +1,4 @@ -/* Renesas SH specific support for 32-bit ELF +/* Renesas / SuperH SH specific support for 32-bit ELF Copyright 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003 Free Software Foundation, Inc. Contributed by Ian Lance Taylor, Cygnus Support. diff --git a/bfd/elf32-sh64-com.c b/bfd/elf32-sh64-com.c index f14a042..b7ae364 100644 --- a/bfd/elf32-sh64-com.c +++ b/bfd/elf32-sh64-com.c @@ -1,4 +1,4 @@ -/* Renesas SH64-specific support for 32-bit ELF +/* SuperH SH64-specific support for 32-bit ELF Copyright 2000, 2001, 2002, 2003 Free Software Foundation, Inc. This file is part of BFD, the Binary File Descriptor library. diff --git a/bfd/elf32-sh64.c b/bfd/elf32-sh64.c index dc21b54..1a2acc1 100644 --- a/bfd/elf32-sh64.c +++ b/bfd/elf32-sh64.c @@ -1,4 +1,4 @@ -/* Renesas SH64-specific support for 32-bit ELF +/* SuperH SH64-specific support for 32-bit ELF Copyright 2000, 2001, 2002, 2003 Free Software Foundation, Inc. This file is part of BFD, the Binary File Descriptor library. diff --git a/bfd/elf64-sh64.c b/bfd/elf64-sh64.c index 5a2f89a..122490e 100644 --- a/bfd/elf64-sh64.c +++ b/bfd/elf64-sh64.c @@ -1,4 +1,4 @@ -/* Renesas SH64-specific support for 64-bit ELF +/* SuperH SH64-specific support for 64-bit ELF Copyright 2000, 2001, 2002, 2003 Free Software Foundation, Inc. This file is part of BFD, the Binary File Descriptor library. diff --git a/bfd/reloc.c b/bfd/reloc.c index 410f6a1..6aea881 100644 --- a/bfd/reloc.c +++ b/bfd/reloc.c @@ -2727,7 +2727,7 @@ ENUMX ENUMX BFD_RELOC_SH_TLS_TPOFF32 ENUMDOC - Renesas SH relocs. Not all of these appear in object files. + Renesas / SuperH SH relocs. Not all of these appear in object files. ENUM BFD_RELOC_THUMB_PCREL_BRANCH9 diff --git a/binutils/ChangeLog b/binutils/ChangeLog index 0f3a282..67c533f 100644 --- a/binutils/ChangeLog +++ b/binutils/ChangeLog @@ -1,5 +1,8 @@ 2003-04-23 J"orn Rennecke + * readelf.c (get_machine_name) : Amend return value + to refer to SuperH. + * readelf.c (decode_location_expression): Don't add a trailing ';'. 2003-04-23 Dimitrie O. Paun diff --git a/binutils/readelf.c b/binutils/readelf.c index 8d4917a..790a609 100644 --- a/binutils/readelf.c +++ b/binutils/readelf.c @@ -1770,7 +1770,7 @@ get_machine_name (e_machine) case EM_MCORE: return "MCORE"; case EM_ARM: return "ARM"; case EM_OLD_ALPHA: return "Digital Alpha (old)"; - case EM_SH: return "Renesas SH"; + case EM_SH: return "Renesas / SuperH SH"; case EM_SPARCV9: return "Sparc v9"; case EM_TRICORE: return "Siemens Tricore"; case EM_ARC: return "ARC"; diff --git a/gas/ChangeLog b/gas/ChangeLog index efa4362..ac6ac66 100644 --- a/gas/ChangeLog +++ b/gas/ChangeLog @@ -1,3 +1,15 @@ +2003-04-23 J"orn Rennecke + + * 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 * 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 1303d23..8c58ce3 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 bc619c7..9923162 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 9b2c9d6..ee63b0e 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 f04f3ec..888ad99 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 cdeffd6..dd78d68 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 30ef85e..7925530 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 9df346c..91b1a7b 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 diff --git a/include/elf/ChangeLog b/include/elf/ChangeLog index ccfe39b..3f7849d 100644 --- a/include/elf/ChangeLog +++ b/include/elf/ChangeLog @@ -1,3 +1,7 @@ +2003-04-23 J"orn Rennecke + + * common.h (EM_SH): Amend comment to refer to SuperH. + 2003-04-22 Kazuhiro Inaoka * common.h: Replace references to Mitsubishi M32R with diff --git a/include/elf/common.h b/include/elf/common.h index 62517f2..ca79342 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 */ diff --git a/ld/testsuite/ChangeLog b/ld/testsuite/ChangeLog index f4ff325..8d2c9de 100644 --- a/ld/testsuite/ChangeLog +++ b/ld/testsuite/ChangeLog @@ -1,3 +1,8 @@ +2003-04-23 J"orn Rennecke + + * ld-sh/sh64/crange3-cmpct.rd (Machine): Change to refer to SuperH. + * ld-sh/sh64/crange3-media.rd (Machine): Likewise. + 2003-04-23 H.J. Lu * ld-elfvers/vers.exp (objdump_dynsymstuff): Support empty diff --git a/ld/testsuite/ld-sh/sh64/crange3-cmpct.rd b/ld/testsuite/ld-sh/sh64/crange3-cmpct.rd index 0ca599b..29e7a00 100644 --- a/ld/testsuite/ld-sh/sh64/crange3-cmpct.rd +++ b/ld/testsuite/ld-sh/sh64/crange3-cmpct.rd @@ -6,7 +6,7 @@ ELF Header: OS/ABI: UNIX - System V ABI Version: 0 Type: EXEC \(Executable file\) - Machine: Renesas SH + Machine: SuperH SH Version: 0x1 Entry point address: 0x10c4 Start of program headers: 52 \(bytes into file\) diff --git a/ld/testsuite/ld-sh/sh64/crange3-media.rd b/ld/testsuite/ld-sh/sh64/crange3-media.rd index 3ce25af..cef884a 100644 --- a/ld/testsuite/ld-sh/sh64/crange3-media.rd +++ b/ld/testsuite/ld-sh/sh64/crange3-media.rd @@ -6,7 +6,7 @@ ELF Header: OS/ABI: UNIX - System V ABI Version: 0 Type: EXEC \(Executable file\) - Machine: Renesas SH + Machine: SuperH SH Version: 0x1 Entry point address: 0x10a5 Start of program headers: 52 \(bytes into file\) -- 2.7.4