From: Nick Clifton <nickc@redhat.com>
Date: Tue, 17 Jun 2003 12:05:33 +0000 (+0000)
Subject: Catch and ignore an ARM_26D reloc.
X-Git-Tag: ezannoni_pie-20030916-branchpoint~1167
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=fea39bcb0781e1ee232093500d9ad8844fd23732;p=platform%2Fupstream%2Fbinutils.git

Catch and ignore an ARM_26D reloc.
---

diff --git a/ld/ChangeLog b/ld/ChangeLog
index d8706a1..11811de 100644
--- 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 db9f2df..b1a3737 100644
--- 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"),