[llvm-commits] [llvm] r111792 - in /llvm/trunk/lib: MC/MCAsmInfoCOFF.cpp Target/X86/X86ISelLowering.cpp

[Michael J. Spencer]

Author: mspencer
Date: Sun Aug 22 23:45:37 2010
New Revision: 111792

URL: http://llvm.org/viewvc/llvm-project?rev=111792&view=rev
Log:
Workaround broken jump tables on x86-64 COFF.

Modified:
    llvm/trunk/lib/MC/MCAsmInfoCOFF.cpp
    llvm/trunk/lib/Target/X86/X86ISelLowering.cpp

Modified: llvm/trunk/lib/MC/MCAsmInfoCOFF.cpp
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/MC/MCAsmInfoCOFF.cpp?rev=111792&r1=111791&r2=111792&view=diff
==============================================================================
--- llvm/trunk/lib/MC/MCAsmInfoCOFF.cpp (original)
+++ llvm/trunk/lib/MC/MCAsmInfoCOFF.cpp Sun Aug 22 23:45:37 2010
@@ -20,6 +20,7 @@
   GlobalPrefix = "_";
   COMMDirectiveAlignmentIsInBytes = false;
   HasLCOMMDirective = true;
+  HasSetDirective = false;
   HasDotTypeDotSizeDirective = false;
   HasSingleParameterDotFile = false;
   PrivateGlobalPrefix = "L";  // Prefix for private global symbols

Modified: llvm/trunk/lib/Target/X86/X86ISelLowering.cpp
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/Target/X86/X86ISelLowering.cpp?rev=111792&r1=111791&r2=111792&view=diff
==============================================================================
--- llvm/trunk/lib/Target/X86/X86ISelLowering.cpp (original)
+++ llvm/trunk/lib/Target/X86/X86ISelLowering.cpp Sun Aug 22 23:45:37 2010
@@ -1029,6 +1029,12 @@
   maxStoresPerMemmove = 3; // For @llvm.memmove -> sequence of stores
   setPrefLoopAlignment(16);
   benefitFromCodePlacementOpt = true;
+
+  // FIXME: Jump tables are currently broken for 64 bit COFF.
+  // See PR7960.
+  if (Subtarget->is64Bit() && Subtarget->isTargetCOFF()) {
+    DisableJumpTables = true;
+  }
 }