Where Triple has a suitable predicate, use it rather than the enum values. NFC.

Reviewers: mcrosier

Subscribers: llvm-commits, rengolin

Differential Revision: http://reviews.llvm.org/D10960

git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@241469 91177308-0d34-0410-b5e6-96231b3b80d8
This commit is contained in:
Daniel Sanders
2015-07-06 16:33:18 +00:00
parent a71390ff3b
commit 24a1fec2a7
5 changed files with 7 additions and 9 deletions

View File

@@ -199,7 +199,7 @@ MCELFStreamer *createAArch64ELFStreamer(MCContext &Context, MCAsmBackend &TAB,
MCTargetStreamer * MCTargetStreamer *
createAArch64ObjectTargetStreamer(MCStreamer &S, const MCSubtargetInfo &STI) { createAArch64ObjectTargetStreamer(MCStreamer &S, const MCSubtargetInfo &STI) {
const Triple &TT = STI.getTargetTriple(); const Triple &TT = STI.getTargetTriple();
if (TT.getObjectFormat() == Triple::ELF) if (TT.isOSBinFormatELF())
return new AArch64TargetELFStreamer(S); return new AArch64TargetELFStreamer(S);
return nullptr; return nullptr;
} }

View File

@@ -1230,8 +1230,7 @@ ARMBaseInstrInfo::expandPostRAPseudo(MachineBasicBlock::iterator MI) const {
Reloc::Model RM = MF.getTarget().getRelocationModel(); Reloc::Model RM = MF.getTarget().getRelocationModel();
if (MI->getOpcode() == TargetOpcode::LOAD_STACK_GUARD) { if (MI->getOpcode() == TargetOpcode::LOAD_STACK_GUARD) {
assert(getSubtarget().getTargetTriple().getObjectFormat() == assert(getSubtarget().getTargetTriple().isOSBinFormatMachO() &&
Triple::MachO &&
"LOAD_STACK_GUARD currently supported only for MachO."); "LOAD_STACK_GUARD currently supported only for MachO.");
expandLoadStackGuard(MI, RM); expandLoadStackGuard(MI, RM);
MI->getParent()->erase(MI); MI->getParent()->erase(MI);

View File

@@ -80,8 +80,7 @@ computeTargetABI(const Triple &TT, StringRef CPU,
// FIXME: This is duplicated code from the front end and should be unified. // FIXME: This is duplicated code from the front end and should be unified.
if (TT.isOSBinFormatMachO()) { if (TT.isOSBinFormatMachO()) {
if (TT.getEnvironment() == llvm::Triple::EABI || if (TT.getEnvironment() == llvm::Triple::EABI ||
(TT.getOS() == llvm::Triple::UnknownOS && (TT.getOS() == llvm::Triple::UnknownOS && TT.isOSBinFormatMachO()) ||
TT.getObjectFormat() == llvm::Triple::MachO) ||
CPU.startswith("cortex-m")) { CPU.startswith("cortex-m")) {
TargetABI = ARMBaseTargetMachine::ARM_ABI_AAPCS; TargetABI = ARMBaseTargetMachine::ARM_ABI_AAPCS;
} else { } else {
@@ -104,8 +103,8 @@ computeTargetABI(const Triple &TT, StringRef CPU,
TargetABI = ARMBaseTargetMachine::ARM_ABI_APCS; TargetABI = ARMBaseTargetMachine::ARM_ABI_APCS;
break; break;
default: default:
if (TT.getOS() == llvm::Triple::NetBSD) if (TT.isOSNetBSD())
TargetABI = ARMBaseTargetMachine::ARM_ABI_APCS; TargetABI = ARMBaseTargetMachine::ARM_ABI_APCS;
else else
TargetABI = ARMBaseTargetMachine::ARM_ABI_AAPCS; TargetABI = ARMBaseTargetMachine::ARM_ABI_AAPCS;
break; break;

View File

@@ -1362,7 +1362,7 @@ MCTargetStreamer *createARMNullTargetStreamer(MCStreamer &S) {
MCTargetStreamer *createARMObjectTargetStreamer(MCStreamer &S, MCTargetStreamer *createARMObjectTargetStreamer(MCStreamer &S,
const MCSubtargetInfo &STI) { const MCSubtargetInfo &STI) {
const Triple &TT = STI.getTargetTriple(); const Triple &TT = STI.getTargetTriple();
if (TT.getObjectFormat() == Triple::ELF) if (TT.isOSBinFormatELF())
return new ARMTargetELFStreamer(S); return new ARMTargetELFStreamer(S);
return new ARMTargetStreamer(S); return new ARMTargetStreamer(S);
} }

View File

@@ -231,7 +231,7 @@ static MCTargetStreamer *createAsmTargetStreamer(MCStreamer &S,
static MCTargetStreamer * static MCTargetStreamer *
createObjectTargetStreamer(MCStreamer &S, const MCSubtargetInfo &STI) { createObjectTargetStreamer(MCStreamer &S, const MCSubtargetInfo &STI) {
const Triple &TT = STI.getTargetTriple(); const Triple &TT = STI.getTargetTriple();
if (TT.getObjectFormat() == Triple::ELF) if (TT.isOSBinFormatELF())
return new PPCTargetELFStreamer(S); return new PPCTargetELFStreamer(S);
return new PPCTargetMachOStreamer(S); return new PPCTargetMachOStreamer(S);
} }