This is the mail archive of the
binutils@sourceware.org
mailing list for the binutils project.
[PATCH 9/9] not for review: gas: Hack pcrel base offsets for wince
- From: Martin Storsjo <martin at martin dot st>
- To: binutils at sourceware dot org
- Date: Thu, 2 May 2013 02:39:08 +0300
- Subject: [PATCH 9/9] not for review: gas: Hack pcrel base offsets for wince
- References: <1367451548-71365-1-git-send-email-martin at martin dot st>
This makes all the relocations end up right, at least in the
tested cases. Implications not yet understood.
---
gas/config/tc-arm.c | 19 ++++++++++++++++++-
1 file changed, 18 insertions(+), 1 deletion(-)
diff --git a/gas/config/tc-arm.c b/gas/config/tc-arm.c
index 373db62..3c62b02 100644
--- a/gas/config/tc-arm.c
+++ b/gas/config/tc-arm.c
@@ -21001,7 +21001,7 @@ md_pcrel_from_section (fixS * fixP, segT seg)
&& ((fixP->fx_addsy && S_GET_SEGMENT (fixP->fx_addsy) != seg)
|| (arm_force_relocation (fixP)
#ifdef TE_WINCE
- && !S_IS_EXTERNAL (fixP->fx_addsy)
+// && !S_IS_EXTERNAL (fixP->fx_addsy)
#endif
)))
base = 0;
@@ -21029,9 +21029,21 @@ md_pcrel_from_section (fixS * fixP, segT seg)
case BFD_RELOC_THUMB_PCREL_BRANCH12:
case BFD_RELOC_THUMB_PCREL_BRANCH20:
case BFD_RELOC_THUMB_PCREL_BRANCH25:
+#ifdef TE_WINCE
+ if (fixP->fx_pcrel
+ && fixP->fx_addsy != NULL
+ && (S_GET_SEGMENT (fixP->fx_addsy) == seg)
+ && (/*S_IS_EXTERNAL (fixP->fx_addsy) ||*/ !arm_force_relocation (fixP)))
+ return base + 4;
+ return base;
+#else
return base + 4;
+#endif
case BFD_RELOC_THUMB_PCREL_BRANCH23:
+#ifdef TE_WINCE
+ return base;
+#else
if (fixP->fx_addsy
&& (S_GET_SEGMENT (fixP->fx_addsy) == seg)
&& !S_FORCE_RELOC (fixP->fx_addsy, TRUE)
@@ -21039,10 +21051,14 @@ md_pcrel_from_section (fixS * fixP, segT seg)
&& ARM_CPU_HAS_FEATURE (selected_cpu, arm_ext_v5t))
base = fixP->fx_where + fixP->fx_frag->fr_address;
return base + 4;
+#endif
/* BLX is like branches above, but forces the low two bits of PC to
zero. */
case BFD_RELOC_THUMB_PCREL_BLX:
+#ifdef TE_WINCE
+ return base;
+#else
if (fixP->fx_addsy
&& (S_GET_SEGMENT (fixP->fx_addsy) == seg)
&& !S_FORCE_RELOC (fixP->fx_addsy, TRUE)
@@ -21050,6 +21066,7 @@ md_pcrel_from_section (fixS * fixP, segT seg)
&& ARM_CPU_HAS_FEATURE (selected_cpu, arm_ext_v5t))
base = fixP->fx_where + fixP->fx_frag->fr_address;
return (base + 4) & ~3;
+#endif
/* ARM mode branches are offset by +8. However, the Windows CE
loader expects the relocation not to take this into account. */
--
1.7.9.4