Catch and ignore an ARM_26D reloc.

diff --git a/ld/ChangeLog b/ld/ChangeLog
index d8706a159486c85ccd0049544fd7236de63ac103..11811de5963278a1ecea737b8422543f1bbdad0f 100644 (file)
--- a/ld/ChangeLog
+++ b/ld/ChangeLog
@@ -1,3 +1,8 @@
+2003-06-17  Rainer Keuchel  <rkeuchel@allgeier.com>
+
+       * pe-dll.c (generate_reloc): Catch and ignore an ARM_26D
+       reloc.  
+
 2003-06-17  Loren James Rittle  <rittle@latour.rsch.comm.mot.com>
 
        * configure.host (*-*-freebsd*): Add known path for ld-elf.so.1

diff --git a/ld/pe-dll.c b/ld/pe-dll.c
index db9f2dfa499b7da33c920e7e770f3a0df4b0ef46..b1a3737ad79dec04f77cf46b4edce21abc1d3692 100644 (file)
--- a/ld/pe-dll.c
+++ b/ld/pe-dll.c
@@ -1202,6 +1202,13 @@ generate_reloc (abfd, info)
                      reloc_data[total_relocs].type = 5;
                      total_relocs++;
                      break;
+                   case BITS_AND_SHIFT (24, 2):
+                     if (relocs[i]->howto->type == 5)
+                       /* This is an ARM_26D reloc, which is an ARM_26 reloc
+                          that has already been fully processed during a
+                          previous link stage, so ignore it here.  */
+                       break;
+                     /* Fall through.  */
                    default:
                      /* xgettext:c-format */
                      einfo (_("%XError: %d-bit reloc in dll\n"),