2002-05-11 Ralf Corsepius <corsepiu@faw.uni-ulm.de>

            Daniel Jacobowitz  <drow@mvista.com>

        * coff-sh.c (sh_reloc_map): Map to R_SH_IMM32 for non-PE.  Don't
        map BFD_RELOC_RVA.

diff --git a/bfd/ChangeLog b/bfd/ChangeLog
index 4b3c8df20efde18731de69574b947b48f8be886c..eb836c3b2e36061fc287b4ff8391d756e8b2efca 100644 (file)
--- a/bfd/ChangeLog
+++ b/bfd/ChangeLog
@@ -1,3 +1,9 @@
+2002-05-11  Ralf Corsepius  <corsepiu@faw.uni-ulm.de>
+            Daniel Jacobowitz  <drow@mvista.com>
+
+       * coff-sh.c (sh_reloc_map): Map to R_SH_IMM32 for non-PE.  Don't
+       map BFD_RELOC_RVA.
+
 2002-05-09  Alan Modra  <amodra@bigpond.net.au>
 
        * elf64-ppc.c (RA_REGISTER_MASK, RA_REGISTER_SHIFT): Delete.

diff --git a/bfd/coff-sh.c b/bfd/coff-sh.c
index ae739968f75aa2254c7cfe5fd890a10dd6fc6365..d1dc4fdbcf720057335a5ba0b9afad503cda71e2 100644 (file)
--- a/bfd/coff-sh.c
+++ b/bfd/coff-sh.c
@@ -473,6 +473,7 @@ struct shcoff_reloc_map
   unsigned char shcoff_reloc_val;
 };
 
+#ifdef COFF_WITH_PE
 /* An array mapping BFD reloc codes to SH PE relocs.  */
 static const struct shcoff_reloc_map sh_reloc_map[] =
 {
@@ -480,6 +481,14 @@ static const struct shcoff_reloc_map sh_reloc_map[] =
   { BFD_RELOC_RVA, R_SH_IMAGEBASE },
   { BFD_RELOC_CTOR, R_SH_IMM32CE },
 };
+#else
+/* An array mapping BFD reloc codes to SH PE relocs.  */
+static const struct shcoff_reloc_map sh_reloc_map[] =
+{
+  { BFD_RELOC_32, R_SH_IMM32 },
+  { BFD_RELOC_CTOR, R_SH_IMM32 },
+};
+#endif
 
 /* Given a BFD reloc code, return the howto structure for the
    corresponding SH PE reloc.  */