@@ -97,7 +97,8 @@ void ARMAsmPrinter::emitXXStructor(const DataLayout &DL, const Constant *CV) {
9797
9898 const MCExpr *E = MCSymbolRefExpr::create (
9999 GetARMGVSymbol (GV, ARMII::MO_NO_FLAG),
100- (Subtarget->isTargetELF () ? ARM::S_TARGET1 : ARM::S_None), OutContext);
100+ (TM.getTargetTriple ().isOSBinFormatELF () ? ARM::S_TARGET1 : ARM::S_None),
101+ OutContext);
101102
102103 OutStreamer->emitValue (E, Size);
103104}
@@ -595,8 +596,7 @@ void ARMAsmPrinter::emitEndOfAsmFile(Module &M) {
595596 ARMTargetStreamer &ATS = static_cast <ARMTargetStreamer &>(TS);
596597
597598 if (OptimizationGoals > 0 &&
598- (Subtarget->isTargetAEABI () || Subtarget->isTargetGNUAEABI () ||
599- Subtarget->isTargetMuslAEABI ()))
599+ (TT.isTargetAEABI () || TT.isTargetGNUAEABI () || TT.isTargetMuslAEABI ()))
600600 ATS.emitAttribute (ARMBuildAttrs::ABI_optimization_goals, OptimizationGoals);
601601 OptimizationGoals = -1 ;
602602
@@ -884,9 +884,10 @@ static uint8_t getModifierSpecifier(ARMCP::ARMCPModifier Modifier) {
884884
885885MCSymbol *ARMAsmPrinter::GetARMGVSymbol (const GlobalValue *GV,
886886 unsigned char TargetFlags) {
887- if (Subtarget->isTargetMachO ()) {
887+ const Triple &TT = TM.getTargetTriple ();
888+ if (TT.isOSBinFormatMachO ()) {
888889 bool IsIndirect =
889- (TargetFlags & ARMII::MO_NONLAZY) && Subtarget-> isGVIndirectSymbol (GV);
890+ (TargetFlags & ARMII::MO_NONLAZY) && getTM (). isGVIndirectSymbol (GV);
890891
891892 if (!IsIndirect)
892893 return getSymbol (GV);
@@ -903,9 +904,8 @@ MCSymbol *ARMAsmPrinter::GetARMGVSymbol(const GlobalValue *GV,
903904 StubSym = MachineModuleInfoImpl::StubValueTy (getSymbol (GV),
904905 !GV->hasInternalLinkage ());
905906 return MCSym;
906- } else if (Subtarget->isTargetCOFF ()) {
907- assert (Subtarget->isTargetWindows () &&
908- " Windows is the only supported COFF target" );
907+ } else if (TT.isOSBinFormatCOFF ()) {
908+ assert (TT.isOSWindows () && " Windows is the only supported COFF target" );
909909
910910 bool IsIndirect =
911911 (TargetFlags & (ARMII::MO_DLLIMPORT | ARMII::MO_COFFSTUB));
@@ -932,7 +932,7 @@ MCSymbol *ARMAsmPrinter::GetARMGVSymbol(const GlobalValue *GV,
932932 }
933933
934934 return MCSym;
935- } else if (Subtarget-> isTargetELF ()) {
935+ } else if (TT. isOSBinFormatELF ()) {
936936 return getSymbolPreferLocal (*GV);
937937 }
938938 llvm_unreachable (" unexpected target" );
@@ -978,7 +978,8 @@ void ARMAsmPrinter::emitMachineConstantPoolValue(
978978
979979 // On Darwin, const-pool entries may get the "FOO$non_lazy_ptr" mangling, so
980980 // flag the global as MO_NONLAZY.
981- unsigned char TF = Subtarget->isTargetMachO () ? ARMII::MO_NONLAZY : 0 ;
981+ unsigned char TF =
982+ TM.getTargetTriple ().isOSBinFormatMachO () ? ARMII::MO_NONLAZY : 0 ;
982983 MCSym = GetARMGVSymbol (GV, TF);
983984 } else if (ACPV->isMachineBasicBlock ()) {
984985 const MachineBasicBlock *MBB = cast<ARMConstantPoolMBB>(ACPV)->getMBB ();
0 commit comments