From 1264624890ee7d11bc5418b155b7aed48d836abd Mon Sep 17 00:00:00 2001
From: Owen Anderson <resistor@mac.com>
Date: Mon, 21 Mar 2011 23:13:43 +0000
Subject: [PATCH] Add support for Thumb interworking addresses for symbol
 offsets that get constant folded very early. This fixes SPASS with
 -integrated-as.  <rdar://problem/9165399>

llvm-svn: 128037
---
 lib/MC/MCExpr.cpp | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/lib/MC/MCExpr.cpp b/lib/MC/MCExpr.cpp
index 54d3743e68e..2debe18bfb2 100644
--- a/lib/MC/MCExpr.cpp
+++ b/lib/MC/MCExpr.cpp
@@ -310,6 +310,11 @@ static void AttemptToFoldSymbolOffsetDifference(const MCAssembler *Asm,
   if (AD.getFragment() == BD.getFragment()) {
     Addend += (AD.getOffset() - BD.getOffset());
 
+    // Pointers to Thumb symbols need to have their low-bit set to allow
+    // for interworking.
+    if (Asm->isThumbFunc(&SA))
+      Addend |= 1;
+
     // Clear the symbol expr pointers to indicate we have folded these
     // operands.
     A = B = 0;