1 files changed, 20 insertions, 2 deletions
diff --git a/lib/Target/ARM/AsmPrinter/ARMAsmPrinter.cpp b/lib/Target/ARM/AsmPrinter/ARMAsmPrinter.cpp
index 43f3360..4d21d5c 100644
--- a/lib/Target/ARM/AsmPrinter/ARMAsmPrinter.cpp
+++ b/lib/Target/ARM/AsmPrinter/ARMAsmPrinter.cpp
@@ -922,11 +922,23 @@ void ARMAsmPrinter::printJTBlockOperand(const MachineInstr *MI, int OpNum) {
   const std::vector<MachineJumpTableEntry> &JT = MJTI->getJumpTables();
   const std::vector<MachineBasicBlock*> &JTBBs = JT[JTI].MBBs;
   bool UseSet= TAI->getSetDirective() && TM.getRelocationModel() == Reloc::PIC_;
+  bool NeedBit0 = Subtarget->isTargetDarwin() && Subtarget->isThumb2();
   SmallPtrSet<MachineBasicBlock*, 8> JTSets;
   for (unsigned i = 0, e = JTBBs.size(); i != e; ++i) {
     MachineBasicBlock *MBB = JTBBs[i];
-    if (UseSet && JTSets.insert(MBB))
-      printPICJumpTableSetLabel(JTI, MO2.getImm(), MBB);
+    if (UseSet && JTSets.insert(MBB)) {
+      // FIXME: Temporary workaround for an assembler bug. The assembler isn't
+      // setting the bit zero to 1 even though it is a thumb address.
+      if (NeedBit0) {
+        O << TAI->getSetDirective() << ' ' << TAI->getPrivateGlobalPrefix()
+          << getFunctionNumber() << '_' << JTI << '_' << MO2.getImm()
+          << "_set_" << MBB->getNumber() << ",(";
+        printBasicBlockLabel(MBB, false, false, false);
+        O << '-' << TAI->getPrivateGlobalPrefix() << "JTI" << getFunctionNumber() 
+          << '_' << JTI << '_' << MO2.getImm() << "+1)\n";
+      } else
+        printPICJumpTableSetLabel(JTI, MO2.getImm(), MBB);
+    }
 
     O << JTEntryDirective << ' ';
     if (UseSet)
@@ -940,7 +952,13 @@ void ARMAsmPrinter::printJTBlockOperand(const MachineInstr *MI, int OpNum) {
         O << '-' << TAI->getPrivateGlobalPrefix() << "JTI"
           << getFunctionNumber() << '_' << JTI << '_' << MO2.getImm();
     } else {
+      // FIXME: Temporary workaround for an assembler bug. The assembler isn't
+      // setting the bit zero to 1 even though it is a thumb address.
+      if (NeedBit0)
+        O << '(';
       printBasicBlockLabel(MBB, false, false, false);
+      if (NeedBit0)
+        O << "+1)";
     }
     if (i != e-1)
       O << '\n';