Skip to content

Commit 2961412

Browse files
committed
Fix createTargetMachine triple argument deprecation
1 parent f3128a1 commit 2961412

File tree

2 files changed

+22
-1
lines changed

2 files changed

+22
-1
lines changed

src/aotcompile.cpp

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1531,7 +1531,11 @@ static AOTOutputs add_output_impl(Module &M, TargetMachine &SourceTM, ShardTimer
15311531
AOTOutputs out;
15321532
auto TM = std::unique_ptr<TargetMachine>(
15331533
SourceTM.getTarget().createTargetMachine(
1534+
#if JL_LLVM_VERSION < 210000
15341535
SourceTM.getTargetTriple().str(),
1536+
#else
1537+
SourceTM.getTargetTriple(),
1538+
#endif
15351539
SourceTM.getTargetCPU(),
15361540
SourceTM.getTargetFeatureString(),
15371541
SourceTM.Options,
@@ -1559,7 +1563,11 @@ static AOTOutputs add_output_impl(Module &M, TargetMachine &SourceTM, ShardTimer
15591563

15601564
auto PMTM = std::unique_ptr<TargetMachine>(
15611565
SourceTM.getTarget().createTargetMachine(
1566+
#if JL_LLVM_VERSION < 210000
15621567
SourceTM.getTargetTriple().str(),
1568+
#else
1569+
SourceTM.getTargetTriple(),
1570+
#endif
15631571
SourceTM.getTargetCPU(),
15641572
SourceTM.getTargetFeatureString(),
15651573
SourceTM.Options,
@@ -2107,7 +2115,11 @@ void jl_dump_native_impl(void *native_code,
21072115
}
21082116
std::unique_ptr<TargetMachine> SourceTM(
21092117
jl_ExecutionEngine->getTarget().createTargetMachine(
2118+
#if JL_LLVM_VERSION < 210000
21102119
TheTriple.getTriple(),
2120+
#else
2121+
TheTriple,
2122+
#endif
21112123
jl_ExecutionEngine->getTargetCPU(),
21122124
jl_ExecutionEngine->getTargetFeatureString(),
21132125
jl_ExecutionEngine->getTargetOptions(),

src/jitlayers.cpp

Lines changed: 10 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1473,7 +1473,12 @@ namespace {
14731473
}
14741474
auto optlevel = CodeGenOptLevelFor(jl_options.opt_level);
14751475
auto TM = TheTarget->createTargetMachine(
1476-
TheTriple.getTriple(), TheCPU, FeaturesStr,
1476+
#if JL_LLVM_VERSION < 210000
1477+
TheTriple.getTriple(),
1478+
#else
1479+
TheTriple,
1480+
#endif
1481+
TheCPU, FeaturesStr,
14771482
options,
14781483
relocmodel,
14791484
codemodel,
@@ -2471,7 +2476,11 @@ std::unique_ptr<TargetMachine> JuliaOJIT::cloneTargetMachine() const
24712476
{
24722477
auto NewTM = std::unique_ptr<TargetMachine>(getTarget()
24732478
.createTargetMachine(
2479+
#if JL_LLVM_VERSION < 210000
24742480
getTargetTriple().str(),
2481+
#else
2482+
getTargetTriple(),
2483+
#endif
24752484
getTargetCPU(),
24762485
getTargetFeatureString(),
24772486
getTargetOptions(),

0 commit comments

Comments
 (0)