Skip to content

Commit 9735198

Browse files
niconico
committed
[clang-cl] Emit nicer warning on unknown /arch: arguments
Now prints the list of known archs. This requires plumbing a Driver arg through a few functions. Also add two more convenience insert() overlods to StringMap. Differential Revision: https://reviews.llvm.org/D109105
1 parent 711aa35 commit 9735198

File tree

17 files changed

+121
-82
lines changed

17 files changed

+121
-82
lines changed

‎clang/include/clang/Basic/DiagnosticDriverKinds.td

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -29,6 +29,9 @@ def err_drv_invalid_riscv_arch_name : Error<
2929
"invalid arch name '%0', %1">;
3030
def err_drv_invalid_riscv_ext_arch_name : Error<
3131
"invalid arch name '%0', %1 '%2'">;
32+
def warn_drv_invalid_arch_name_with_suggestion : Warning<
33+
"ignoring invalid /arch: argument '%0'; for %select{64|32}1-bit expected one of %2">,
34+
InGroup<UnusedCommandLineArgument>;
3235
def warn_drv_avr_mcu_not_specified : Warning<
3336
"no target microcontroller specified on command line, cannot "
3437
"link standard libraries, please pass -mmcu=<mcu name>">,

‎clang/lib/Driver/ToolChains/AVR.cpp

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -315,7 +315,7 @@ AVRToolChain::AVRToolChain(const Driver &D, const llvm::Triple &Triple,
315315
if (!Args.hasArg(options::OPT_nostdlib) &&
316316
!Args.hasArg(options::OPT_nodefaultlibs) &&
317317
!Args.hasArg(options::OPT_c /* does not apply when not linking */)) {
318-
std::string CPU = getCPUName(Args, Triple);
318+
std::string CPU = getCPUName(D, Args, Triple);
319319

320320
if (CPU.empty()) {
321321
// We cannot link any standard libraries without an MCU specified.
@@ -389,8 +389,10 @@ void AVR::Linker::ConstructJob(Compilation &C, const JobAction &JA,
389389
const InputInfo &Output,
390390
const InputInfoList &Inputs, const ArgList &Args,
391391
const char *LinkingOutput) const {
392+
const Driver &D = getToolChain().getDriver();
393+
392394
// Compute information about the target AVR.
393-
std::string CPU = getCPUName(Args, getToolChain().getTriple());
395+
std::string CPU = getCPUName(D, Args, getToolChain().getTriple());
394396
llvm::Optional<StringRef> FamilyName = GetMCUFamilyName(CPU);
395397
llvm::Optional<unsigned> SectionAddressData = GetMCUSectionAddressData(CPU);
396398

@@ -414,9 +416,7 @@ void AVR::Linker::ConstructJob(Compilation &C, const JobAction &JA,
414416
CmdArgs.push_back(Args.MakeArgString(DataSectionArg));
415417
} else {
416418
// We do not have an entry for this CPU in the address mapping table yet.
417-
getToolChain().getDriver().Diag(
418-
diag::warn_drv_avr_linker_section_addresses_not_implemented)
419-
<< CPU;
419+
D.Diag(diag::warn_drv_avr_linker_section_addresses_not_implemented) << CPU;
420420
}
421421

422422
// If the family name is known, we can link with the device-specific libgcc.

‎clang/lib/Driver/ToolChains/Arch/Mips.cpp

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -441,15 +441,16 @@ bool mips::isUCLibc(const ArgList &Args) {
441441
return A && A->getOption().matches(options::OPT_muclibc);
442442
}
443443

444-
bool mips::isNaN2008(const ArgList &Args, const llvm::Triple &Triple) {
444+
bool mips::isNaN2008(const Driver &D, const ArgList &Args,
445+
const llvm::Triple &Triple) {
445446
if (Arg *NaNArg = Args.getLastArg(options::OPT_mnan_EQ))
446447
return llvm::StringSwitch<bool>(NaNArg->getValue())
447448
.Case("2008", true)
448449
.Case("legacy", false)
449450
.Default(false);
450451

451452
// NaN2008 is the default for MIPS32r6/MIPS64r6.
452-
return llvm::StringSwitch<bool>(getCPUName(Args, Triple))
453+
return llvm::StringSwitch<bool>(getCPUName(D, Args, Triple))
453454
.Cases("mips32r6", "mips64r6", true)
454455
.Default(false);
455456
}

‎clang/lib/Driver/ToolChains/Arch/Mips.h

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -44,7 +44,8 @@ std::string getMipsABILibSuffix(const llvm::opt::ArgList &Args,
4444
const llvm::Triple &Triple);
4545
bool hasMipsAbiArg(const llvm::opt::ArgList &Args, const char *Value);
4646
bool isUCLibc(const llvm::opt::ArgList &Args);
47-
bool isNaN2008(const llvm::opt::ArgList &Args, const llvm::Triple &Triple);
47+
bool isNaN2008(const Driver &D, const llvm::opt::ArgList &Args,
48+
const llvm::Triple &Triple);
4849
bool isFP64ADefault(const llvm::Triple &Triple, StringRef CPUName);
4950
bool isFPXXDefault(const llvm::Triple &Triple, StringRef CPUName,
5051
StringRef ABIName, mips::FloatABI FloatABI);

‎clang/lib/Driver/ToolChains/Arch/X86.cpp

Lines changed: 28 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,8 @@
1111
#include "clang/Driver/Driver.h"
1212
#include "clang/Driver/DriverDiagnostic.h"
1313
#include "clang/Driver/Options.h"
14+
#include "llvm/ADT/StringExtras.h"
15+
#include "llvm/ADT/StringMap.h"
1416
#include "llvm/ADT/StringSwitch.h"
1517
#include "llvm/Option/ArgList.h"
1618
#include "llvm/Support/Host.h"
@@ -20,7 +22,7 @@ using namespace clang::driver::tools;
2022
using namespace clang;
2123
using namespace llvm::opt;
2224

23-
std::string x86::getX86TargetCPU(const ArgList &Args,
25+
std::string x86::getX86TargetCPU(const Driver &D, const ArgList &Args,
2426
const llvm::Triple &Triple) {
2527
if (const Arg *A = Args.getLastArg(clang::driver::options::OPT_march_EQ)) {
2628
StringRef CPU = A->getValue();
@@ -37,29 +39,34 @@ std::string x86::getX86TargetCPU(const ArgList &Args,
3739
return std::string(CPU);
3840
}
3941

40-
if (const Arg *A = Args.getLastArgNoClaim(options::OPT__SLASH_arch)) {
42+
if (const Arg *A = Args.getLastArg(options::OPT__SLASH_arch)) {
4143
// Mapping built by looking at lib/Basic's X86TargetInfo::initFeatureMap().
42-
StringRef Arch = A->getValue();
43-
StringRef CPU;
44-
if (Triple.getArch() == llvm::Triple::x86) { // 32-bit-only /arch: flags.
45-
CPU = llvm::StringSwitch<StringRef>(Arch)
46-
.Case("IA32", "i386")
47-
.Case("SSE", "pentium3")
48-
.Case("SSE2", "pentium4")
49-
.Default("");
44+
// The keys are case-sensitive; this matches link.exe.
45+
// 32-bit and 64-bit /arch: flags.
46+
llvm::StringMap<StringRef> ArchMap({
47+
{"AVX", "sandybridge"},
48+
{"AVX2", "haswell"},
49+
{"AVX512F", "knl"},
50+
{"AVX512", "skylake-avx512"},
51+
});
52+
if (Triple.getArch() == llvm::Triple::x86) {
53+
// 32-bit-only /arch: flags.
54+
ArchMap.insert({
55+
{"IA32", "i386"},
56+
{"SSE", "pentium3"},
57+
{"SSE2", "pentium4"},
58+
});
5059
}
51-
if (CPU.empty()) { // 32-bit and 64-bit /arch: flags.
52-
CPU = llvm::StringSwitch<StringRef>(Arch)
53-
.Case("AVX", "sandybridge")
54-
.Case("AVX2", "haswell")
55-
.Case("AVX512F", "knl")
56-
.Case("AVX512", "skylake-avx512")
57-
.Default("");
58-
}
59-
if (!CPU.empty()) {
60-
A->claim();
61-
return std::string(CPU);
60+
StringRef CPU = ArchMap.lookup(A->getValue());
61+
if (CPU.empty()) {
62+
std::vector<StringRef> ValidArchs{ArchMap.keys().begin(),
63+
ArchMap.keys().end()};
64+
sort(ValidArchs);
65+
D.Diag(diag::warn_drv_invalid_arch_name_with_suggestion)
66+
<< A->getValue() << (Triple.getArch() == llvm::Triple::x86)
67+
<< join(ValidArchs, ", ");
6268
}
69+
return std::string(CPU);
6370
}
6471

6572
// Select the default CPU if none was given (or detection failed).

‎clang/lib/Driver/ToolChains/Arch/X86.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ namespace driver {
2121
namespace tools {
2222
namespace x86 {
2323

24-
std::string getX86TargetCPU(const llvm::opt::ArgList &Args,
24+
std::string getX86TargetCPU(const Driver &D, const llvm::opt::ArgList &Args,
2525
const llvm::Triple &Triple);
2626

2727
void getX86TargetFeatures(const Driver &D, const llvm::Triple &Triple,

‎clang/lib/Driver/ToolChains/Clang.cpp

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1588,16 +1588,16 @@ void AddAAPCSVolatileBitfieldArgs(const ArgList &Args, ArgStringList &CmdArgs) {
15881588
}
15891589

15901590
namespace {
1591-
void RenderARMABI(const llvm::Triple &Triple, const ArgList &Args,
1592-
ArgStringList &CmdArgs) {
1591+
void RenderARMABI(const Driver &D, const llvm::Triple &Triple,
1592+
const ArgList &Args, ArgStringList &CmdArgs) {
15931593
// Select the ABI to use.
15941594
// FIXME: Support -meabi.
15951595
// FIXME: Parts of this are duplicated in the backend, unify this somehow.
15961596
const char *ABIName = nullptr;
15971597
if (Arg *A = Args.getLastArg(options::OPT_mabi_EQ)) {
15981598
ABIName = A->getValue();
15991599
} else {
1600-
std::string CPU = getCPUName(Args, Triple, /*FromAs*/ false);
1600+
std::string CPU = getCPUName(D, Args, Triple, /*FromAs*/ false);
16011601
ABIName = llvm::ARM::computeDefaultTargetABI(Triple, CPU).data();
16021602
}
16031603

@@ -1608,7 +1608,7 @@ void RenderARMABI(const llvm::Triple &Triple, const ArgList &Args,
16081608

16091609
void Clang::AddARMTargetArgs(const llvm::Triple &Triple, const ArgList &Args,
16101610
ArgStringList &CmdArgs, bool KernelOrKext) const {
1611-
RenderARMABI(Triple, Args, CmdArgs);
1611+
RenderARMABI(getToolChain().getDriver(), Triple, Args, CmdArgs);
16121612

16131613
// Determine floating point ABI from the options & target defaults.
16141614
arm::FloatABI ABI = arm::getARMFloatABI(getToolChain(), Args);
@@ -4595,7 +4595,7 @@ void Clang::ConstructJob(Compilation &C, const JobAction &JA,
45954595
case llvm::Triple::arm:
45964596
case llvm::Triple::armeb:
45974597
case llvm::Triple::thumbeb:
4598-
RenderARMABI(Triple, Args, CmdArgs);
4598+
RenderARMABI(D, Triple, Args, CmdArgs);
45994599
break;
46004600
case llvm::Triple::aarch64:
46014601
case llvm::Triple::aarch64_32:
@@ -5132,7 +5132,7 @@ void Clang::ConstructJob(Compilation &C, const JobAction &JA,
51325132
const ArgList &HostArgs =
51335133
C.getArgsForToolChain(nullptr, StringRef(), Action::OFK_None);
51345134
std::string HostCPU =
5135-
getCPUName(HostArgs, *TC.getAuxTriple(), /*FromAs*/ false);
5135+
getCPUName(D, HostArgs, *TC.getAuxTriple(), /*FromAs*/ false);
51365136
if (!HostCPU.empty()) {
51375137
CmdArgs.push_back("-aux-target-cpu");
51385138
CmdArgs.push_back(Args.MakeArgString(HostCPU));
@@ -5174,7 +5174,7 @@ void Clang::ConstructJob(Compilation &C, const JobAction &JA,
51745174
}
51755175

51765176
// Add the target cpu
5177-
std::string CPU = getCPUName(Args, Triple, /*FromAs*/ false);
5177+
std::string CPU = getCPUName(D, Args, Triple, /*FromAs*/ false);
51785178
if (!CPU.empty()) {
51795179
CmdArgs.push_back("-target-cpu");
51805180
CmdArgs.push_back(Args.MakeArgString(CPU));
@@ -7450,7 +7450,7 @@ void ClangAs::ConstructJob(Compilation &C, const JobAction &JA,
74507450
CmdArgs.push_back(Clang::getBaseInputName(Args, Input));
74517451

74527452
// Add the target cpu
7453-
std::string CPU = getCPUName(Args, Triple, /*FromAs*/ true);
7453+
std::string CPU = getCPUName(D, Args, Triple, /*FromAs*/ true);
74547454
if (!CPU.empty()) {
74557455
CmdArgs.push_back("-target-cpu");
74567456
CmdArgs.push_back(Args.MakeArgString(CPU));

‎clang/lib/Driver/ToolChains/CommonArgs.cpp

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -355,8 +355,8 @@ static StringRef getWebAssemblyTargetCPU(const ArgList &Args) {
355355
return "generic";
356356
}
357357

358-
std::string tools::getCPUName(const ArgList &Args, const llvm::Triple &T,
359-
bool FromAs) {
358+
std::string tools::getCPUName(const Driver &D, const ArgList &Args,
359+
const llvm::Triple &T, bool FromAs) {
360360
Arg *A;
361361

362362
switch (T.getArch()) {
@@ -442,7 +442,7 @@ std::string tools::getCPUName(const ArgList &Args, const llvm::Triple &T,
442442

443443
case llvm::Triple::x86:
444444
case llvm::Triple::x86_64:
445-
return x86::getX86TargetCPU(Args, T);
445+
return x86::getX86TargetCPU(D, Args, T);
446446

447447
case llvm::Triple::hexagon:
448448
return "hexagon" +
@@ -510,7 +510,7 @@ void tools::addLTOOptions(const ToolChain &ToolChain, const ArgList &Args,
510510
// the plugin.
511511

512512
// Handle flags for selecting CPU variants.
513-
std::string CPU = getCPUName(Args, ToolChain.getTriple());
513+
std::string CPU = getCPUName(D, Args, ToolChain.getTriple());
514514
if (!CPU.empty())
515515
CmdArgs.push_back(Args.MakeArgString(Twine("-plugin-opt=mcpu=") + CPU));
516516

‎clang/lib/Driver/ToolChains/CommonArgs.h

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -107,8 +107,8 @@ void AddTargetFeature(const llvm::opt::ArgList &Args,
107107
llvm::opt::OptSpecifier OnOpt,
108108
llvm::opt::OptSpecifier OffOpt, StringRef FeatureName);
109109

110-
std::string getCPUName(const llvm::opt::ArgList &Args, const llvm::Triple &T,
111-
bool FromAs = false);
110+
std::string getCPUName(const Driver &D, const llvm::opt::ArgList &Args,
111+
const llvm::Triple &T, bool FromAs = false);
112112

113113
/// Iterate \p Args and convert -mxxx to +xxx and -mno-xxx to -xxx and
114114
/// append it to \p Features.

‎clang/lib/Driver/ToolChains/FreeBSD.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -99,7 +99,7 @@ void freebsd::Assembler::ConstructJob(Compilation &C, const JobAction &JA,
9999
case llvm::Triple::sparc:
100100
case llvm::Triple::sparcel:
101101
case llvm::Triple::sparcv9: {
102-
std::string CPU = getCPUName(Args, getToolChain().getTriple());
102+
std::string CPU = getCPUName(D, Args, getToolChain().getTriple());
103103
CmdArgs.push_back(
104104
sparc::getSparcAsmModeForCPU(CPU, getToolChain().getTriple()));
105105
AddAssemblerKPIC(getToolChain(), Args, CmdArgs);

‎clang/lib/Driver/ToolChains/Gnu.cpp

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -451,7 +451,7 @@ void tools::gnutools::Linker::ConstructJob(Compilation &C, const JobAction &JA,
451451
// Most Android ARM64 targets should enable the linker fix for erratum
452452
// 843419. Only non-Cortex-A53 devices are allowed to skip this flag.
453453
if (Arch == llvm::Triple::aarch64 && isAndroid) {
454-
std::string CPU = getCPUName(Args, Triple);
454+
std::string CPU = getCPUName(D, Args, Triple);
455455
if (CPU.empty() || CPU == "generic" || CPU == "cortex-a53")
456456
CmdArgs.push_back("--fix-cortex-a53-843419");
457457
}
@@ -734,32 +734,32 @@ void tools::gnutools::Assembler::ConstructJob(Compilation &C,
734734
CmdArgs.push_back("-a32");
735735
CmdArgs.push_back("-mppc");
736736
CmdArgs.push_back("-mbig-endian");
737-
CmdArgs.push_back(
738-
ppc::getPPCAsmModeForCPU(getCPUName(Args, getToolChain().getTriple())));
737+
CmdArgs.push_back(ppc::getPPCAsmModeForCPU(
738+
getCPUName(D, Args, getToolChain().getTriple())));
739739
break;
740740
}
741741
case llvm::Triple::ppcle: {
742742
CmdArgs.push_back("-a32");
743743
CmdArgs.push_back("-mppc");
744744
CmdArgs.push_back("-mlittle-endian");
745-
CmdArgs.push_back(
746-
ppc::getPPCAsmModeForCPU(getCPUName(Args, getToolChain().getTriple())));
745+
CmdArgs.push_back(ppc::getPPCAsmModeForCPU(
746+
getCPUName(D, Args, getToolChain().getTriple())));
747747
break;
748748
}
749749
case llvm::Triple::ppc64: {
750750
CmdArgs.push_back("-a64");
751751
CmdArgs.push_back("-mppc64");
752752
CmdArgs.push_back("-mbig-endian");
753-
CmdArgs.push_back(
754-
ppc::getPPCAsmModeForCPU(getCPUName(Args, getToolChain().getTriple())));
753+
CmdArgs.push_back(ppc::getPPCAsmModeForCPU(
754+
getCPUName(D, Args, getToolChain().getTriple())));
755755
break;
756756
}
757757
case llvm::Triple::ppc64le: {
758758
CmdArgs.push_back("-a64");
759759
CmdArgs.push_back("-mppc64");
760760
CmdArgs.push_back("-mlittle-endian");
761-
CmdArgs.push_back(
762-
ppc::getPPCAsmModeForCPU(getCPUName(Args, getToolChain().getTriple())));
761+
CmdArgs.push_back(ppc::getPPCAsmModeForCPU(
762+
getCPUName(D, Args, getToolChain().getTriple())));
763763
break;
764764
}
765765
case llvm::Triple::riscv32:
@@ -775,15 +775,15 @@ void tools::gnutools::Assembler::ConstructJob(Compilation &C,
775775
case llvm::Triple::sparc:
776776
case llvm::Triple::sparcel: {
777777
CmdArgs.push_back("-32");
778-
std::string CPU = getCPUName(Args, getToolChain().getTriple());
778+
std::string CPU = getCPUName(D, Args, getToolChain().getTriple());
779779
CmdArgs.push_back(
780780
sparc::getSparcAsmModeForCPU(CPU, getToolChain().getTriple()));
781781
AddAssemblerKPIC(getToolChain(), Args, CmdArgs);
782782
break;
783783
}
784784
case llvm::Triple::sparcv9: {
785785
CmdArgs.push_back("-64");
786-
std::string CPU = getCPUName(Args, getToolChain().getTriple());
786+
std::string CPU = getCPUName(D, Args, getToolChain().getTriple());
787787
CmdArgs.push_back(
788788
sparc::getSparcAsmModeForCPU(CPU, getToolChain().getTriple()));
789789
AddAssemblerKPIC(getToolChain(), Args, CmdArgs);
@@ -1473,7 +1473,7 @@ bool clang::driver::findMIPSMultilibs(const Driver &D,
14731473
addMultilibFlag(CPUName == "mips64r6", "march=mips64r6", Flags);
14741474
addMultilibFlag(isMicroMips(Args), "mmicromips", Flags);
14751475
addMultilibFlag(tools::mips::isUCLibc(Args), "muclibc", Flags);
1476-
addMultilibFlag(tools::mips::isNaN2008(Args, TargetTriple), "mnan=2008",
1476+
addMultilibFlag(tools::mips::isNaN2008(D, Args, TargetTriple), "mnan=2008",
14771477
Flags);
14781478
addMultilibFlag(ABIName == "n32", "mabi=n32", Flags);
14791479
addMultilibFlag(ABIName == "n64", "mabi=n64", Flags);

‎clang/lib/Driver/ToolChains/Linux.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -453,7 +453,7 @@ std::string Linux::getDynamicLinker(const ArgList &Args) const {
453453
case llvm::Triple::mipsel:
454454
case llvm::Triple::mips64:
455455
case llvm::Triple::mips64el: {
456-
bool IsNaN2008 = tools::mips::isNaN2008(Args, Triple);
456+
bool IsNaN2008 = tools::mips::isNaN2008(getDriver(), Args, Triple);
457457

458458
LibDir = "lib" + tools::mips::getMipsABILibSuffix(Args, Triple);
459459

‎clang/lib/Driver/ToolChains/NetBSD.cpp

Lines changed: 8 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -29,6 +29,8 @@ void netbsd::Assembler::ConstructJob(Compilation &C, const JobAction &JA,
2929
const InputInfoList &Inputs,
3030
const ArgList &Args,
3131
const char *LinkingOutput) const {
32+
const Driver &D = getToolChain().getDriver();
33+
3234
claimNoWarnArgs(Args);
3335
ArgStringList CmdArgs;
3436

@@ -76,16 +78,18 @@ void netbsd::Assembler::ConstructJob(Compilation &C, const JobAction &JA,
7678
case llvm::Triple::sparc:
7779
case llvm::Triple::sparcel: {
7880
CmdArgs.push_back("-32");
79-
std::string CPU = getCPUName(Args, getToolChain().getTriple());
80-
CmdArgs.push_back(sparc::getSparcAsmModeForCPU(CPU, getToolChain().getTriple()));
81+
std::string CPU = getCPUName(D, Args, getToolChain().getTriple());
82+
CmdArgs.push_back(
83+
sparc::getSparcAsmModeForCPU(CPU, getToolChain().getTriple()));
8184
AddAssemblerKPIC(getToolChain(), Args, CmdArgs);
8285
break;
8386
}
8487

8588
case llvm::Triple::sparcv9: {
8689
CmdArgs.push_back("-64");
87-
std::string CPU = getCPUName(Args, getToolChain().getTriple());
88-
CmdArgs.push_back(sparc::getSparcAsmModeForCPU(CPU, getToolChain().getTriple()));
90+
std::string CPU = getCPUName(D, Args, getToolChain().getTriple());
91+
CmdArgs.push_back(
92+
sparc::getSparcAsmModeForCPU(CPU, getToolChain().getTriple()));
8993
AddAssemblerKPIC(getToolChain(), Args, CmdArgs);
9094
break;
9195
}

‎clang/lib/Driver/ToolChains/OpenBSD.cpp

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -45,8 +45,10 @@ void openbsd::Assembler::ConstructJob(Compilation &C, const JobAction &JA,
4545

4646
case llvm::Triple::sparcv9: {
4747
CmdArgs.push_back("-64");
48-
std::string CPU = getCPUName(Args, getToolChain().getTriple());
49-
CmdArgs.push_back(sparc::getSparcAsmModeForCPU(CPU, getToolChain().getTriple()));
48+
std::string CPU = getCPUName(getToolChain().getDriver(), Args,
49+
getToolChain().getTriple());
50+
CmdArgs.push_back(
51+
sparc::getSparcAsmModeForCPU(CPU, getToolChain().getTriple()));
5052
AddAssemblerKPIC(getToolChain(), Args, CmdArgs);
5153
break;
5254
}

0 commit comments

Comments
 (0)