* tc-h8300.c: If OBJ_ELF, include elf/h8.h, and define

        assorted coff relocations to the corresponding elf relocations.
        * tc-h8300.h (TARGET_ARCH, TARGET_FORMAT): Define appropriately.
More of Joern's patches.

diff --git a/gas/ChangeLog b/gas/ChangeLog
index bc2af7d..732d60f 100644 (file)
--- a/gas/ChangeLog
+++ b/gas/ChangeLog
@@ -12,6 +12,10 @@ Wed Aug 29 12:49:58 2001  Jeffrey A Law  (law@cygnus.com)
 
 Wed Aug 29 12:05:13 2001  J"orn Rennecke <amylaar@redhat.com>
 
 
 Wed Aug 29 12:05:13 2001  J"orn Rennecke <amylaar@redhat.com>
 

+       * tc-h8300.c: If OBJ_ELF, include elf/h8.h, and define
+       assorted coff relocations to the corresponding elf relocations.
+       * tc-h8300.h (TARGET_ARCH, TARGET_FORMAT): Define appropriately.
+

        * configure.in: Add case for h8300-*-elf.
        * configure: Regenerate.
 
        * configure.in: Add case for h8300-*-elf.
        * configure: Regenerate.
 

diff --git a/gas/config/tc-h8300.c b/gas/config/tc-h8300.c
index d9721f7..1965ba3 100644 (file)
--- a/gas/config/tc-h8300.c
+++ b/gas/config/tc-h8300.c
@@ -1,5 +1,5 @@
 /* tc-h8300.c -- Assemble code for the Hitachi H8/300
 /* tc-h8300.c -- Assemble code for the Hitachi H8/300

-   Copyright 1991, 1992, 1993, 1994, 1995, 1996, 1997, 1998, 2000
+   Copyright 1991, 1992, 1993, 1994, 1995, 1996, 1997, 1998, 2000, 2001

    Free Software Foundation, Inc.
 
    This file is part of GAS, the GNU Assembler.
    Free Software Foundation, Inc.
 
    This file is part of GAS, the GNU Assembler.


@@ -30,6 +30,22 @@
 #include "opcode/h8300.h"
 #include <ctype.h>
 
 #include "opcode/h8300.h"
 #include <ctype.h>
 

+#ifdef OBJ_ELF
+#include "elf/h8.h"
+
+#define R_MOV24B1 BFD_RELOC_H8_DIR24A8
+#define R_MOVL1 BFD_RELOC_H8_DIR32A16
+#define R_MOV24B1 BFD_RELOC_H8_DIR24A8
+#define R_MOVL1 BFD_RELOC_H8_DIR32A16
+#define R_RELLONG BFD_RELOC_32
+#define R_MOV16B1 BFD_RELOC_H8_DIR16A8
+#define R_RELWORD BFD_RELOC_16
+#define R_RELBYTE BFD_RELOC_8
+#define R_PCRWORD BFD_RELOC_16_PCREL
+#define R_PCRBYTE BFD_RELOC_8_PCREL
+#define R_JMPL1 BFD_RELOC_H8_DIR24R8
+#endif
+

 const char comment_chars[] = ";";
 const char line_comment_chars[] = "#";
 const char line_separator_chars[] = "";
 const char comment_chars[] = ";";
 const char line_comment_chars[] = "#";
 const char line_separator_chars[] = "";

diff --git a/gas/config/tc-h8300.h b/gas/config/tc-h8300.h
index 06530a4..a70792a 100644 (file)
--- a/gas/config/tc-h8300.h
+++ b/gas/config/tc-h8300.h
@@ -24,6 +24,12 @@
 
 #define TARGET_BYTES_BIG_ENDIAN 1
 
 
 #define TARGET_BYTES_BIG_ENDIAN 1
 

+#define TARGET_ARCH bfd_arch_h8300
+
+#ifdef OBJ_ELF
+#define TARGET_FORMAT "elf32-h8300"
+#endif
+

 #if ANSI_PROTOTYPES
 struct internal_reloc;
 #endif
 #if ANSI_PROTOTYPES
 struct internal_reloc;
 #endif