2004-06-30 Andrew Stubbs <andrew.stubbs@superh.com>

	bfd:
	* elf32-sh.c: Include ../opcodes/sh-opc.h .
	* Makefile.am: Ran make dep-am .
	* Makefile.in: Ran make dep-in .

	gas:
	* config/tc-sh.c (md_assemble): Change isspace to ISSPACE.
	(md_parse_option): Remove redundant -isa testing.
	Make bfd_arch variable const.
	(md_show_usage): Make bfd_arch variable const.

diff --git a/bfd/ChangeLog b/bfd/ChangeLog
index 198494653e9e6199fcf44fe88776b555477692d5..ad7b8a4119e4479abee17be9ddc2953c59282993 100644 (file)
--- a/bfd/ChangeLog
+++ b/bfd/ChangeLog
@@ -1,3 +1,9 @@
+2004-07-05  Andrew Stubbs <andrew.stubbs@superh.com>
+
+       * elf32-sh.c: Include ../opcodes/sh-opc.h .
+       * Makefile.am: Ran make dep-am .
+       * Makefile.in: Ran make dep-in .
+
 2004-07-03  Aaron W. LaFramboise  <aaron98wiridge9@aaronwl.com>
 
        * cofflink.c (_bfd_coff_generic_relocate_section): Resolve PE weak

diff --git a/bfd/Makefile.am b/bfd/Makefile.am
index 076eec2d82c40e47b25dfe63ac5eeb3e445848d8..c7ef7d7af942be604ea588c8735d642dd96fbfa5 100644 (file)
--- a/bfd/Makefile.am
+++ b/bfd/Makefile.am
@@ -908,7 +908,8 @@ syms.lo: syms.c $(INCDIR)/filenames.h $(INCDIR)/safe-ctype.h \
   $(INCDIR)/bfdlink.h $(INCDIR)/aout/stab_gnu.h $(INCDIR)/aout/stab.def
 targets.lo: targets.c $(INCDIR)/filenames.h $(INCDIR)/fnmatch.h \
   targmatch.h
-hash.lo: hash.c $(INCDIR)/filenames.h $(INCDIR)/objalloc.h $(INCDIR)/libiberty.h
+hash.lo: hash.c $(INCDIR)/filenames.h $(INCDIR)/objalloc.h \
+  $(INCDIR)/libiberty.h
 linker.lo: linker.c $(INCDIR)/filenames.h $(INCDIR)/bfdlink.h \
   genlink.h
 srec.lo: srec.c $(INCDIR)/filenames.h $(INCDIR)/libiberty.h \
@@ -1294,7 +1295,8 @@ elf32-sh64.lo: elf32-sh64.c $(INCDIR)/filenames.h elf-bfd.h \
   $(INCDIR)/elf/common.h $(INCDIR)/elf/internal.h $(INCDIR)/elf/external.h \
   $(INCDIR)/bfdlink.h $(srcdir)/../opcodes/sh64-opc.h \
   elf32-sh64.h elf32-sh.c $(INCDIR)/elf/sh.h $(INCDIR)/elf/reloc-macros.h \
-  $(INCDIR)/libiberty.h elf32-target.h
+  $(INCDIR)/libiberty.h $(srcdir)/../opcodes/sh-opc.h \
+  elf32-target.h
 elf32-sh64-com.lo: elf32-sh64-com.c $(INCDIR)/filenames.h \
   elf-bfd.h $(INCDIR)/elf/common.h $(INCDIR)/elf/internal.h \
   $(INCDIR)/elf/external.h $(INCDIR)/bfdlink.h $(INCDIR)/elf/sh.h \
@@ -1306,7 +1308,8 @@ elf32-s390.lo: elf32-s390.c $(INCDIR)/filenames.h $(INCDIR)/bfdlink.h \
 elf32-sh.lo: elf32-sh.c $(INCDIR)/filenames.h $(INCDIR)/bfdlink.h \
   elf-bfd.h $(INCDIR)/elf/common.h $(INCDIR)/elf/internal.h \
   $(INCDIR)/elf/external.h $(INCDIR)/elf/sh.h $(INCDIR)/elf/reloc-macros.h \
-  $(INCDIR)/libiberty.h elf32-target.h
+  $(INCDIR)/libiberty.h $(srcdir)/../opcodes/sh-opc.h \
+  elf32-target.h
 elf32-sparc.lo: elf32-sparc.c $(INCDIR)/filenames.h \
   $(INCDIR)/bfdlink.h elf-bfd.h $(INCDIR)/elf/common.h \
   $(INCDIR)/elf/internal.h $(INCDIR)/elf/external.h $(INCDIR)/elf/sparc.h \

diff --git a/bfd/Makefile.in b/bfd/Makefile.in
index 4795750de4207651bb93f0095011fe41df03c5b0..240e5fd74237d2140c328f65539b1c2cfe3d26cb 100644 (file)
--- a/bfd/Makefile.in
+++ b/bfd/Makefile.in
@@ -1441,7 +1441,8 @@ syms.lo: syms.c $(INCDIR)/filenames.h $(INCDIR)/safe-ctype.h \
   $(INCDIR)/bfdlink.h $(INCDIR)/aout/stab_gnu.h $(INCDIR)/aout/stab.def
 targets.lo: targets.c $(INCDIR)/filenames.h $(INCDIR)/fnmatch.h \
   targmatch.h
-hash.lo: hash.c $(INCDIR)/filenames.h $(INCDIR)/objalloc.h $(INCDIR)/libiberty.h
+hash.lo: hash.c $(INCDIR)/filenames.h $(INCDIR)/objalloc.h \
+  $(INCDIR)/libiberty.h
 linker.lo: linker.c $(INCDIR)/filenames.h $(INCDIR)/bfdlink.h \
   genlink.h
 srec.lo: srec.c $(INCDIR)/filenames.h $(INCDIR)/libiberty.h \
@@ -1827,7 +1828,8 @@ elf32-sh64.lo: elf32-sh64.c $(INCDIR)/filenames.h elf-bfd.h \
   $(INCDIR)/elf/common.h $(INCDIR)/elf/internal.h $(INCDIR)/elf/external.h \
   $(INCDIR)/bfdlink.h $(srcdir)/../opcodes/sh64-opc.h \
   elf32-sh64.h elf32-sh.c $(INCDIR)/elf/sh.h $(INCDIR)/elf/reloc-macros.h \
-  $(INCDIR)/libiberty.h elf32-target.h
+  $(INCDIR)/libiberty.h $(srcdir)/../opcodes/sh-opc.h \
+  elf32-target.h
 elf32-sh64-com.lo: elf32-sh64-com.c $(INCDIR)/filenames.h \
   elf-bfd.h $(INCDIR)/elf/common.h $(INCDIR)/elf/internal.h \
   $(INCDIR)/elf/external.h $(INCDIR)/bfdlink.h $(INCDIR)/elf/sh.h \
@@ -1839,7 +1841,8 @@ elf32-s390.lo: elf32-s390.c $(INCDIR)/filenames.h $(INCDIR)/bfdlink.h \
 elf32-sh.lo: elf32-sh.c $(INCDIR)/filenames.h $(INCDIR)/bfdlink.h \
   elf-bfd.h $(INCDIR)/elf/common.h $(INCDIR)/elf/internal.h \
   $(INCDIR)/elf/external.h $(INCDIR)/elf/sh.h $(INCDIR)/elf/reloc-macros.h \
-  $(INCDIR)/libiberty.h elf32-target.h
+  $(INCDIR)/libiberty.h $(srcdir)/../opcodes/sh-opc.h \
+  elf32-target.h
 elf32-sparc.lo: elf32-sparc.c $(INCDIR)/filenames.h \
   $(INCDIR)/bfdlink.h elf-bfd.h $(INCDIR)/elf/common.h \
   $(INCDIR)/elf/internal.h $(INCDIR)/elf/external.h $(INCDIR)/elf/sparc.h \
@@ -2186,7 +2189,3 @@ pepigen.lo: pepigen.c $(INCDIR)/filenames.h $(INCDIR)/coff/internal.h \
   $(INCDIR)/coff/ia64.h $(INCDIR)/coff/external.h $(INCDIR)/coff/pe.h \
   libcoff.h $(INCDIR)/bfdlink.h libpei.h
 # IF YOU PUT ANYTHING HERE IT WILL GO AWAY
-
-# Tell versions [3.59,3.63) of GNU make to not export all variables.
-# Otherwise a system limit (for SysV at least) may be exceeded.
-.NOEXPORT:

diff --git a/bfd/elf32-sh.c b/bfd/elf32-sh.c
index fb45aebc55e7074b090af4aac9288bd08253e3d5..e1d7e1a5050179424111726a1bdcbeb8ad9a9af7 100644 (file)
--- a/bfd/elf32-sh.c
+++ b/bfd/elf32-sh.c
@@ -26,6 +26,7 @@
 #include "elf-bfd.h"
 #include "elf/sh.h"
 #include "libiberty.h"
+#include "../opcodes/sh-opc.h"
 
 static bfd_reloc_status_type sh_elf_reloc
   (bfd *, arelent *, asymbol *, void *, asection *, bfd *, char **);

diff --git a/gas/ChangeLog b/gas/ChangeLog
index 86101d4fd423c4d28773571c73aba4aee0d35afa..6c1c22f75eca2f83e45cc10bbb8451cb561cc3fd 100644 (file)
--- a/gas/ChangeLog
+++ b/gas/ChangeLog
@@ -1,3 +1,11 @@
+2004-07-05  Andrew Stubbs <andrew.stubbs@superh.com>
+
+       gas:
+       * config/tc-sh.c (md_assemble): Change isspace to ISSPACE.
+       (md_parse_option): Remove redundant -isa testing.
+       Make bfd_arch variable const.
+       (md_show_usage): Make bfd_arch variable const.
+
 2004-07-03  James E Wilson  <wilson@specifixinc.com>
 
        * config/tc-ia64.c (emit_one_bundle): Check and set insn_addr.

diff --git a/gas/config/tc-sh.c b/gas/config/tc-sh.c
index a7e60ea9d0b59cce4776908b9d212696ddfe08b5..f33925bb5e402b8acb98cb9da0eef9c185314073 100644 (file)
--- a/gas/config/tc-sh.c
+++ b/gas/config/tc-sh.c
@@ -2631,11 +2631,11 @@ md_assemble (char *str)
       int found = 0;
 
       /* identify opcode in string */
-      while (isspace (*name))
+      while (ISSPACE (*name))
        {
          name++;
        }
-      while (!isspace (name[name_length]))
+      while (!ISSPACE (name[name_length]))
        {
          name_length++;
        }
@@ -2945,15 +2945,7 @@ md_parse_option (int c, char *arg ATTRIBUTE_UNUSED)
       break;
 
     case OPTION_ISA:
-      if (strcasecmp (arg, "sh4") == 0)
-       preset_target_arch = arch_sh4;
-      else if (strcasecmp (arg, "sh4-nofpu") == 0)
-       preset_target_arch = arch_sh4_nofpu;
-      else if (strcasecmp (arg, "sh4-nommu-nofpu") == 0)
-       preset_target_arch = arch_sh4_nommu_nofpu;
-      else if (strcasecmp (arg, "sh4a") == 0)
-       preset_target_arch = arch_sh4a;
-      else if (strcasecmp (arg, "dsp") == 0)
+      if (strcasecmp (arg, "dsp") == 0)
        preset_target_arch = arch_sh1_up & ~(arch_sh_sp_fpu|arch_sh_dp_fpu);
       else if (strcasecmp (arg, "fp") == 0)
        preset_target_arch = arch_sh1_up & ~arch_sh_has_dsp;
@@ -2978,8 +2970,7 @@ md_parse_option (int c, char *arg ATTRIBUTE_UNUSED)
       else
        {
          extern const bfd_arch_info_type bfd_sh_arch;
-         extern unsigned int sh_ef_archset_table[];
-         bfd_arch_info_type *bfd_arch = &bfd_sh_arch;
+         bfd_arch_info_type const *bfd_arch = &bfd_sh_arch;
          preset_target_arch = 0;
          for (; bfd_arch; bfd_arch=bfd_arch->next)
            {
@@ -3068,7 +3059,7 @@ SH options:\n\
     | fp"));
   {
     extern const bfd_arch_info_type bfd_sh_arch;
-    bfd_arch_info_type *bfd_arch = &bfd_sh_arch;
+    bfd_arch_info_type const *bfd_arch = &bfd_sh_arch;
     for (; bfd_arch; bfd_arch=bfd_arch->next)
       if (bfd_arch->mach != bfd_mach_sh5)
        {