diff options
Diffstat (limited to 'gas')
| -rw-r--r-- | gas/ChangeLog | 10 | ||||
| -rw-r--r-- | gas/Makefile.am | 5 | ||||
| -rw-r--r-- | gas/Makefile.in | 5 | ||||
| -rw-r--r-- | gas/config/tc-m68hc11.c | 3 | ||||
| -rw-r--r-- | gas/config/tc-sh64.c | 6 | ||||
| -rw-r--r-- | gas/config/tc-sh64.h | 3 |
6 files changed, 22 insertions, 10 deletions
diff --git a/gas/ChangeLog b/gas/ChangeLog index 80db1d4..42973b8 100644 --- a/gas/ChangeLog +++ b/gas/ChangeLog @@ -1,3 +1,13 @@ +2003-01-23 Alan Modra <amodra@bigpond.net.au> + + * config/tc-sh64.c (shmedia_frob_section_type): Adjust for changed + sh64_elf_section_data. + * config/tc-sh64.h: Include elf32-sh64.h. + * config/tc-m68hc11.c: Don't include stdio.h. + (md_show_usage): Fix missing continuation. + * Makefile.am: Run "make dep-am". + * Makefile.in: Regenerate. + 2003-01-22 Nick Clifton <nickc@redhat.com> * as.h: Include fopen-bin.h not fopen-same.h for mingw32 hosts. diff --git a/gas/Makefile.am b/gas/Makefile.am index 11213bf..15f8f18 100644 --- a/gas/Makefile.am +++ b/gas/Makefile.am @@ -1398,7 +1398,7 @@ DEPTC_sh64_elf = $(INCDIR)/symcat.h $(srcdir)/config/obj-elf.h \ $(BFDDIR)/elf-bfd.h $(INCDIR)/elf/common.h $(INCDIR)/elf/internal.h \ $(INCDIR)/elf/external.h $(INCDIR)/bfdlink.h $(srcdir)/config/tc-sh64.h \ $(srcdir)/config/tc-sh.h $(INCDIR)/elf/sh.h $(INCDIR)/elf/reloc-macros.h \ - $(INCDIR)/safe-ctype.h $(srcdir)/../opcodes/sh64-opc.h \ + $(BFDDIR)/elf32-sh64.h $(INCDIR)/safe-ctype.h $(srcdir)/../opcodes/sh64-opc.h \ $(srcdir)/config/tc-sh.c subsegs.h $(INCDIR)/obstack.h \ $(srcdir)/../opcodes/sh-opc.h struc-symbol.h dwarf2dbg.h DEPTC_sparc_aout = $(INCDIR)/symcat.h $(srcdir)/config/obj-aout.h \ @@ -2290,7 +2290,8 @@ DEP_sh_elf = $(srcdir)/config/obj-elf.h $(INCDIR)/symcat.h \ DEP_sh64_elf = $(srcdir)/config/obj-elf.h $(INCDIR)/symcat.h \ $(BFDDIR)/elf-bfd.h $(INCDIR)/elf/common.h $(INCDIR)/elf/internal.h \ $(INCDIR)/elf/external.h $(INCDIR)/bfdlink.h $(srcdir)/config/tc-sh64.h \ - $(srcdir)/config/tc-sh.h $(INCDIR)/elf/sh.h $(INCDIR)/elf/reloc-macros.h + $(srcdir)/config/tc-sh.h $(INCDIR)/elf/sh.h $(INCDIR)/elf/reloc-macros.h \ + $(BFDDIR)/elf32-sh64.h DEP_sparc_aout = $(srcdir)/config/obj-aout.h $(srcdir)/config/tc-sparc.h \ $(BFDDIR)/libaout.h $(INCDIR)/bfdlink.h DEP_sparc_coff = $(srcdir)/config/obj-coff.h $(srcdir)/config/tc-sparc.h \ diff --git a/gas/Makefile.in b/gas/Makefile.in index 9828c78..75e8767 100644 --- a/gas/Makefile.in +++ b/gas/Makefile.in @@ -1188,7 +1188,7 @@ DEPTC_sh64_elf = $(INCDIR)/symcat.h $(srcdir)/config/obj-elf.h \ $(BFDDIR)/elf-bfd.h $(INCDIR)/elf/common.h $(INCDIR)/elf/internal.h \ $(INCDIR)/elf/external.h $(INCDIR)/bfdlink.h $(srcdir)/config/tc-sh64.h \ $(srcdir)/config/tc-sh.h $(INCDIR)/elf/sh.h $(INCDIR)/elf/reloc-macros.h \ - $(INCDIR)/safe-ctype.h $(srcdir)/../opcodes/sh64-opc.h \ + $(BFDDIR)/elf32-sh64.h $(INCDIR)/safe-ctype.h $(srcdir)/../opcodes/sh64-opc.h \ $(srcdir)/config/tc-sh.c subsegs.h $(INCDIR)/obstack.h \ $(srcdir)/../opcodes/sh-opc.h struc-symbol.h dwarf2dbg.h @@ -2312,7 +2312,8 @@ DEP_sh_elf = $(srcdir)/config/obj-elf.h $(INCDIR)/symcat.h \ DEP_sh64_elf = $(srcdir)/config/obj-elf.h $(INCDIR)/symcat.h \ $(BFDDIR)/elf-bfd.h $(INCDIR)/elf/common.h $(INCDIR)/elf/internal.h \ $(INCDIR)/elf/external.h $(INCDIR)/bfdlink.h $(srcdir)/config/tc-sh64.h \ - $(srcdir)/config/tc-sh.h $(INCDIR)/elf/sh.h $(INCDIR)/elf/reloc-macros.h + $(srcdir)/config/tc-sh.h $(INCDIR)/elf/sh.h $(INCDIR)/elf/reloc-macros.h \ + $(BFDDIR)/elf32-sh64.h DEP_sparc_aout = $(srcdir)/config/obj-aout.h $(srcdir)/config/tc-sparc.h \ $(BFDDIR)/libaout.h $(INCDIR)/bfdlink.h diff --git a/gas/config/tc-m68hc11.c b/gas/config/tc-m68hc11.c index a56ff04..da0f2ba 100644 --- a/gas/config/tc-m68hc11.c +++ b/gas/config/tc-m68hc11.c @@ -19,7 +19,6 @@ the Free Software Foundation, 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ -#include <stdio.h> #include "as.h" #include "safe-ctype.h" #include "subsegs.h" @@ -376,7 +375,7 @@ md_show_usage (stream) get_default_target (); fprintf (stream, _("\ Motorola 68HC11/68HC12/68HCS12 options:\n\ - -m68hc11 | -m68hc12 | + -m68hc11 | -m68hc12 |\n\ -m68hcs12 specify the processor [default %s]\n\ -mshort use 16-bit int ABI (default)\n\ -mlong use 32-bit int ABI\n\ diff --git a/gas/config/tc-sh64.c b/gas/config/tc-sh64.c index c6321f2..aa5f71e 100644 --- a/gas/config/tc-sh64.c +++ b/gas/config/tc-sh64.c @@ -1,5 +1,5 @@ /* tc-sh64.c -- Assemble code for the Hitachi Super-H SHcompact and SHmedia. - Copyright 2000, 2001, 2002 Free Software Foundation. + Copyright 2000, 2001, 2002, 2003 Free Software Foundation. This file is part of GAS, the GNU Assembler. @@ -463,11 +463,11 @@ shmedia_frob_section_type (sec) else if (seginfo->tc_segment_info_data.contents_type == CRT_SH5_ISA32) sec_type = SHF_SH5_ISA32; - sec_elf_data = sh64_elf_section_data (sec); + sec_elf_data = sh64_elf_section_data (sec)->sh64_info; if (sec_elf_data == NULL) { sec_elf_data = xcalloc (1, sizeof (*sec_elf_data)); - sh64_elf_section_data (sec) = sec_elf_data; + sh64_elf_section_data (sec)->sh64_info = sec_elf_data; } sec_elf_data->contents_flags = sec_type; diff --git a/gas/config/tc-sh64.h b/gas/config/tc-sh64.h index ad631c5..c5758d2 100644 --- a/gas/config/tc-sh64.h +++ b/gas/config/tc-sh64.h @@ -1,5 +1,5 @@ /* This file is tc-sh64.h - Copyright 2000, 2001, 2002 Free Software Foundation, Inc. + Copyright 2000, 2001, 2002, 2003 Free Software Foundation, Inc. This file is part of GAS, the GNU Assembler. @@ -21,6 +21,7 @@ #define TC_SH64 #include "config/tc-sh.h" #include "elf/sh.h" +#include "elf32-sh64.h" /* We need to override the tc-sh.h settings of HANDLE_ALIGN and MAX_MEM_FOR_RS_ALIGN_CODE; we might need to put in SHmedia NOP:s, not |