summaryrefslogtreecommitdiffstats
path: root/llvm/lib/Target
diff options
context:
space:
mode:
Diffstat (limited to 'llvm/lib/Target')
-rw-r--r--llvm/lib/Target/ARM/ARMMCAsmInfo.cpp1
-rw-r--r--llvm/lib/Target/ARM/AsmPrinter/ARMAsmPrinter.cpp4
-rw-r--r--llvm/lib/Target/Alpha/AlphaMCAsmInfo.cpp1
-rw-r--r--llvm/lib/Target/Blackfin/BlackfinMCAsmInfo.cpp1
-rw-r--r--llvm/lib/Target/CellSPU/SPUMCAsmInfo.cpp1
-rw-r--r--llvm/lib/Target/MSP430/MSP430MCAsmInfo.cpp1
-rw-r--r--llvm/lib/Target/Mips/MipsMCAsmInfo.cpp1
-rw-r--r--llvm/lib/Target/PIC16/PIC16MCAsmInfo.cpp2
-rw-r--r--llvm/lib/Target/PowerPC/PPCMCAsmInfo.cpp1
-rw-r--r--llvm/lib/Target/Sparc/SparcMCAsmInfo.cpp1
-rw-r--r--llvm/lib/Target/SystemZ/SystemZMCAsmInfo.cpp1
-rw-r--r--llvm/lib/Target/X86/X86MCAsmInfo.cpp1
-rw-r--r--llvm/lib/Target/XCore/AsmPrinter/XCoreAsmPrinter.cpp2
-rw-r--r--llvm/lib/Target/XCore/XCoreMCAsmInfo.cpp1
14 files changed, 7 insertions, 12 deletions
diff --git a/llvm/lib/Target/ARM/ARMMCAsmInfo.cpp b/llvm/lib/Target/ARM/ARMMCAsmInfo.cpp
index 911a71fbdd8..ccd6addd82b 100644
--- a/llvm/lib/Target/ARM/ARMMCAsmInfo.cpp
+++ b/llvm/lib/Target/ARM/ARMMCAsmInfo.cpp
@@ -62,7 +62,6 @@ ARMELFMCAsmInfo::ARMELFMCAsmInfo() {
AbsoluteDebugSectionOffsets = true;
PrivateGlobalPrefix = ".L";
WeakRefDirective = "\t.weak\t";
- SetDirective = "\t.set\t";
HasLCOMMDirective = true;
DwarfRequiresFrameSection = false;
diff --git a/llvm/lib/Target/ARM/AsmPrinter/ARMAsmPrinter.cpp b/llvm/lib/Target/ARM/AsmPrinter/ARMAsmPrinter.cpp
index bb6fc2f2dfa..2b0b77acdb7 100644
--- a/llvm/lib/Target/ARM/AsmPrinter/ARMAsmPrinter.cpp
+++ b/llvm/lib/Target/ARM/AsmPrinter/ARMAsmPrinter.cpp
@@ -939,14 +939,14 @@ void ARMAsmPrinter::printJTBlockOperand(const MachineInstr *MI, int OpNum) {
const MachineJumpTableInfo *MJTI = MF->getJumpTableInfo();
const std::vector<MachineJumpTableEntry> &JT = MJTI->getJumpTables();
const std::vector<MachineBasicBlock*> &JTBBs = JT[JTI].MBBs;
- bool UseSet= MAI->getSetDirective() && TM.getRelocationModel() == Reloc::PIC_;
+ bool UseSet= MAI->hasSetDirective() && TM.getRelocationModel() == Reloc::PIC_;
SmallPtrSet<MachineBasicBlock*, 8> JTSets;
for (unsigned i = 0, e = JTBBs.size(); i != e; ++i) {
MachineBasicBlock *MBB = JTBBs[i];
bool isNew = JTSets.insert(MBB);
if (UseSet && isNew) {
- O << MAI->getSetDirective() << ' '
+ O << "\t.set\t"
<< *GetARMSetPICJumpTableLabel2(JTI, MO2.getImm(), MBB) << ','
<< *MBB->getSymbol(OutContext) << '-' << *JTISymbol << '\n';
}
diff --git a/llvm/lib/Target/Alpha/AlphaMCAsmInfo.cpp b/llvm/lib/Target/Alpha/AlphaMCAsmInfo.cpp
index 0e63582faca..c67c6a235b1 100644
--- a/llvm/lib/Target/Alpha/AlphaMCAsmInfo.cpp
+++ b/llvm/lib/Target/Alpha/AlphaMCAsmInfo.cpp
@@ -19,4 +19,5 @@ AlphaMCAsmInfo::AlphaMCAsmInfo(const Target &T, const StringRef &TT) {
PrivateGlobalPrefix = "$";
GPRel32Directive = ".gprel32";
WeakRefDirective = "\t.weak\t";
+ HasSetDirective = false;
}
diff --git a/llvm/lib/Target/Blackfin/BlackfinMCAsmInfo.cpp b/llvm/lib/Target/Blackfin/BlackfinMCAsmInfo.cpp
index 6d0f66cd7a5..31470fb35b9 100644
--- a/llvm/lib/Target/Blackfin/BlackfinMCAsmInfo.cpp
+++ b/llvm/lib/Target/Blackfin/BlackfinMCAsmInfo.cpp
@@ -18,4 +18,5 @@ using namespace llvm;
BlackfinMCAsmInfo::BlackfinMCAsmInfo(const Target &T, const StringRef &TT) {
GlobalPrefix = "_";
CommentString = "//";
+ HasSetDirective = false;
}
diff --git a/llvm/lib/Target/CellSPU/SPUMCAsmInfo.cpp b/llvm/lib/Target/CellSPU/SPUMCAsmInfo.cpp
index c10b460e733..5ef3c6b24de 100644
--- a/llvm/lib/Target/CellSPU/SPUMCAsmInfo.cpp
+++ b/llvm/lib/Target/CellSPU/SPUMCAsmInfo.cpp
@@ -16,7 +16,6 @@ using namespace llvm;
SPULinuxMCAsmInfo::SPULinuxMCAsmInfo(const Target &T, const StringRef &TT) {
ZeroDirective = "\t.space\t";
- SetDirective = "\t.set";
Data64bitsDirective = "\t.quad\t";
AlignmentIsInBytes = false;
HasLCOMMDirective = true;
diff --git a/llvm/lib/Target/MSP430/MSP430MCAsmInfo.cpp b/llvm/lib/Target/MSP430/MSP430MCAsmInfo.cpp
index 516eacb5356..cfb499d1323 100644
--- a/llvm/lib/Target/MSP430/MSP430MCAsmInfo.cpp
+++ b/llvm/lib/Target/MSP430/MSP430MCAsmInfo.cpp
@@ -17,7 +17,6 @@ using namespace llvm;
MSP430MCAsmInfo::MSP430MCAsmInfo(const Target &T, const StringRef &TT) {
PrivateGlobalPrefix = ".L";
WeakRefDirective ="\t.weak\t";
- SetDirective = "\t.set\t";
PCSymbol=".";
CommentString = ";";
diff --git a/llvm/lib/Target/Mips/MipsMCAsmInfo.cpp b/llvm/lib/Target/Mips/MipsMCAsmInfo.cpp
index c5356f0e23a..89e3e11b0a7 100644
--- a/llvm/lib/Target/Mips/MipsMCAsmInfo.cpp
+++ b/llvm/lib/Target/Mips/MipsMCAsmInfo.cpp
@@ -23,4 +23,5 @@ MipsMCAsmInfo::MipsMCAsmInfo(const Target &T, const StringRef &TT) {
CommentString = "#";
ZeroDirective = "\t.space\t";
GPRel32Directive = "\t.gpword\t";
+ HasSetDirective = false;
}
diff --git a/llvm/lib/Target/PIC16/PIC16MCAsmInfo.cpp b/llvm/lib/Target/PIC16/PIC16MCAsmInfo.cpp
index 827315e13b7..b08054270ce 100644
--- a/llvm/lib/Target/PIC16/PIC16MCAsmInfo.cpp
+++ b/llvm/lib/Target/PIC16/PIC16MCAsmInfo.cpp
@@ -37,7 +37,7 @@ PIC16MCAsmInfo::PIC16MCAsmInfo(const Target &T, const StringRef &TT) {
RomData8bitsDirective = " dw ";
RomData16bitsDirective = " rom_di ";
RomData32bitsDirective = " rom_dl ";
-
+ HasSetDirective = false;
// Set it to false because we weed to generate c file name and not bc file
// name.
diff --git a/llvm/lib/Target/PowerPC/PPCMCAsmInfo.cpp b/llvm/lib/Target/PowerPC/PPCMCAsmInfo.cpp
index c61627ec533..b0d04e46e09 100644
--- a/llvm/lib/Target/PowerPC/PPCMCAsmInfo.cpp
+++ b/llvm/lib/Target/PowerPC/PPCMCAsmInfo.cpp
@@ -49,7 +49,6 @@ PPCLinuxMCAsmInfo::PPCLinuxMCAsmInfo(bool is64Bit) {
AbsoluteEHSectionOffsets = false;
ZeroDirective = "\t.space\t";
- SetDirective = "\t.set";
Data64bitsDirective = is64Bit ? "\t.quad\t" : 0;
HasLCOMMDirective = true;
AssemblerDialect = 0; // Old-Style mnemonics.
diff --git a/llvm/lib/Target/Sparc/SparcMCAsmInfo.cpp b/llvm/lib/Target/Sparc/SparcMCAsmInfo.cpp
index 923181d7e44..53a9bde9252 100644
--- a/llvm/lib/Target/Sparc/SparcMCAsmInfo.cpp
+++ b/llvm/lib/Target/Sparc/SparcMCAsmInfo.cpp
@@ -29,7 +29,6 @@ SparcELFMCAsmInfo::SparcELFMCAsmInfo(const Target &T, const StringRef &TT) {
UsesELFSectionDirectiveForBSS = true;
WeakRefDirective = "\t.weak\t";
- SetDirective = "\t.set\t";
PrivateGlobalPrefix = ".L";
}
diff --git a/llvm/lib/Target/SystemZ/SystemZMCAsmInfo.cpp b/llvm/lib/Target/SystemZ/SystemZMCAsmInfo.cpp
index 52d4d5149c6..1a0920609b1 100644
--- a/llvm/lib/Target/SystemZ/SystemZMCAsmInfo.cpp
+++ b/llvm/lib/Target/SystemZ/SystemZMCAsmInfo.cpp
@@ -18,7 +18,6 @@ using namespace llvm;
SystemZMCAsmInfo::SystemZMCAsmInfo(const Target &T, const StringRef &TT) {
PrivateGlobalPrefix = ".L";
WeakRefDirective = "\t.weak\t";
- SetDirective = "\t.set\t";
PCSymbol = ".";
}
diff --git a/llvm/lib/Target/X86/X86MCAsmInfo.cpp b/llvm/lib/Target/X86/X86MCAsmInfo.cpp
index c0cab869794..d3b00521aa0 100644
--- a/llvm/lib/Target/X86/X86MCAsmInfo.cpp
+++ b/llvm/lib/Target/X86/X86MCAsmInfo.cpp
@@ -72,7 +72,6 @@ X86ELFMCAsmInfo::X86ELFMCAsmInfo(const Triple &Triple) {
PrivateGlobalPrefix = ".L";
WeakRefDirective = "\t.weak\t";
- SetDirective = "\t.set\t";
PCSymbol = ".";
// Set up DWARF directives
diff --git a/llvm/lib/Target/XCore/AsmPrinter/XCoreAsmPrinter.cpp b/llvm/lib/Target/XCore/AsmPrinter/XCoreAsmPrinter.cpp
index e955ef96ee0..15b454861e3 100644
--- a/llvm/lib/Target/XCore/AsmPrinter/XCoreAsmPrinter.cpp
+++ b/llvm/lib/Target/XCore/AsmPrinter/XCoreAsmPrinter.cpp
@@ -106,7 +106,7 @@ void XCoreAsmPrinter::emitArrayBound(const MCSymbol *Sym,
cast<PointerType>(GV->getType())->getElementType())) {
O << MAI->getGlobalDirective() << *Sym;
O << ".globound" << "\n";
- O << MAI->getSetDirective() << *Sym;
+ O << "\t.set\t" << *Sym;
O << ".globound" << "," << ATy->getNumElements() << "\n";
if (GV->hasWeakLinkage() || GV->hasLinkOnceLinkage()) {
// TODO Use COMDAT groups for LinkOnceLinkage
diff --git a/llvm/lib/Target/XCore/XCoreMCAsmInfo.cpp b/llvm/lib/Target/XCore/XCoreMCAsmInfo.cpp
index dffdda9a1fd..bf785755db4 100644
--- a/llvm/lib/Target/XCore/XCoreMCAsmInfo.cpp
+++ b/llvm/lib/Target/XCore/XCoreMCAsmInfo.cpp
@@ -22,7 +22,6 @@ XCoreMCAsmInfo::XCoreMCAsmInfo(const Target &T, const StringRef &TT) {
AscizDirective = ".asciiz";
WeakDefDirective = "\t.weak\t";
WeakRefDirective = "\t.weak\t";
- SetDirective = "\t.set\t";
// Debug
HasLEB128 = true;
OpenPOWER on IntegriCloud