remove JumpTableDirective, it is always null.
git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@94445 91177308-0d34-0410-b5e6-96231b3b80d8
diff --git a/lib/CodeGen/AsmPrinter/AsmPrinter.cpp b/lib/CodeGen/AsmPrinter/AsmPrinter.cpp
index 292fcdb..39712de 100644
--- a/lib/CodeGen/AsmPrinter/AsmPrinter.cpp
+++ b/lib/CodeGen/AsmPrinter/AsmPrinter.cpp
@@ -538,7 +538,8 @@
// Use JumpTableDirective otherwise honor the entry size from the jump table
// info.
- const char *JTEntryDirective = MAI->getJumpTableDirective(isPIC);
+ const char *JTEntryDirective = 0;
+ if (isPIC) JTEntryDirective = MAI->getPICJumpTableDirective();
bool HadJTEntryDirective = JTEntryDirective != NULL;
if (!HadJTEntryDirective) {
JTEntryDirective = MJTI->getEntrySize() == 4 ?
diff --git a/lib/MC/MCAsmInfo.cpp b/lib/MC/MCAsmInfo.cpp
index c0ca7e9..0f3c46b 100644
--- a/lib/MC/MCAsmInfo.cpp
+++ b/lib/MC/MCAsmInfo.cpp
@@ -48,7 +48,6 @@
AlignDirective = "\t.align\t";
AlignmentIsInBytes = true;
TextAlignFillValue = 0;
- JumpTableDirective = 0;
PICJumpTableDirective = 0;
GlobalDirective = "\t.globl\t";
SetDirective = 0;
diff --git a/lib/Target/X86/AsmPrinter/X86AsmPrinter.cpp b/lib/Target/X86/AsmPrinter/X86AsmPrinter.cpp
index b365497..44a9a28 100644
--- a/lib/Target/X86/AsmPrinter/X86AsmPrinter.cpp
+++ b/lib/Target/X86/AsmPrinter/X86AsmPrinter.cpp
@@ -460,7 +460,7 @@
return;
// We don't need .set machinery if we have GOT-style relocations
- if (Subtarget->isPICStyleGOT())
+ if (Subtarget->isPICStyleGOT()) // X86-32 on ELF.
return;
O << MAI->getSetDirective() << ' ' << MAI->getPrivateGlobalPrefix()