@@ -375,16 +375,12 @@ bool LTOCodeGenerator::determineTarget() {
375
375
if (TargetMach)
376
376
return true ;
377
377
378
- TripleStr = MergedModule->getTargetTriple ().str ();
379
- if (TripleStr.empty ()) {
380
- TripleStr = sys::getDefaultTargetTriple ();
381
- MergedModule->setTargetTriple (Triple (TripleStr));
382
- }
383
- llvm::Triple Triple (TripleStr);
378
+ if (MergedModule->getTargetTriple ().empty ())
379
+ MergedModule->setTargetTriple (Triple (sys::getDefaultTargetTriple ()));
384
380
385
381
// create target machine from info for merged modules
386
382
std::string ErrMsg;
387
- MArch = TargetRegistry::lookupTarget (Triple , ErrMsg);
383
+ MArch = TargetRegistry::lookupTarget (MergedModule-> getTargetTriple () , ErrMsg);
388
384
if (!MArch) {
389
385
emitError (ErrMsg);
390
386
return false ;
@@ -393,10 +389,10 @@ bool LTOCodeGenerator::determineTarget() {
393
389
// Construct LTOModule, hand over ownership of module and target. Use MAttr as
394
390
// the default set of features.
395
391
SubtargetFeatures Features (join (Config.MAttrs , " " ));
396
- Features.getDefaultSubtargetFeatures (Triple );
392
+ Features.getDefaultSubtargetFeatures (MergedModule-> getTargetTriple () );
397
393
FeatureStr = Features.getString ();
398
394
if (Config.CPU .empty ())
399
- Config.CPU = lto::getThinLTODefaultCPU (Triple );
395
+ Config.CPU = lto::getThinLTODefaultCPU (MergedModule-> getTargetTriple () );
400
396
401
397
// If data-sections is not explicitly set or unset, set data-sections by
402
398
// default to match the behaviour of lld and gold plugin.
@@ -412,7 +408,7 @@ bool LTOCodeGenerator::determineTarget() {
412
408
std::unique_ptr<TargetMachine> LTOCodeGenerator::createTargetMachine () {
413
409
assert (MArch && " MArch is not set!" );
414
410
return std::unique_ptr<TargetMachine>(MArch->createTargetMachine (
415
- Triple (TripleStr ), Config.CPU , FeatureStr, Config.Options ,
411
+ MergedModule-> getTargetTriple ( ), Config.CPU , FeatureStr, Config.Options ,
416
412
Config.RelocModel , std::nullopt , Config.CGOptLevel ));
417
413
}
418
414
0 commit comments