Skip to content

Commit f43fa7b

Browse files
committed
Update CGFT_*File to CodeGenFileType
See llvm/llvm-project#66295
1 parent 3f21a13 commit f43fa7b

File tree

2 files changed

+10
-2
lines changed

2 files changed

+10
-2
lines changed

src/aotcompile.cpp

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1166,7 +1166,11 @@ static AOTOutputs add_output_impl(Module &M, TargetMachine &SourceTM, ShardTimer
11661166
raw_svector_ostream OS(out.obj);
11671167
legacy::PassManager emitter;
11681168
addTargetPasses(&emitter, TM->getTargetTriple(), TM->getTargetIRAnalysis());
1169+
#if JL_LLVM_VERSION >= 180000
1170+
if (TM->addPassesToEmitFile(emitter, OS, nullptr, CodeGenFileType::ObjectFile, false))
1171+
#else
11691172
if (TM->addPassesToEmitFile(emitter, OS, nullptr, CGFT_ObjectFile, false))
1173+
#endif
11701174
jl_safe_printf("ERROR: target does not support generation of object files\n");
11711175
emitter.run(M);
11721176
timers.obj.stopTimer();
@@ -1177,7 +1181,7 @@ static AOTOutputs add_output_impl(Module &M, TargetMachine &SourceTM, ShardTimer
11771181
raw_svector_ostream OS(out.asm_);
11781182
legacy::PassManager emitter;
11791183
addTargetPasses(&emitter, TM->getTargetTriple(), TM->getTargetIRAnalysis());
1180-
if (TM->addPassesToEmitFile(emitter, OS, nullptr, CGFT_AssemblyFile, false))
1184+
if (TM->addPassesToEmitFile(emitter, OS, nullptr, CodeGenFileType::AssemblyFile, false))
11811185
jl_safe_printf("ERROR: target does not support generation of assembly files\n");
11821186
emitter.run(M);
11831187
timers.asm_.stopTimer();

src/disasm.cpp

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1224,7 +1224,11 @@ jl_value_t *jl_dump_function_asm_impl(jl_llvmf_dump_t* dump, char emit_mc, const
12241224
addTargetPasses(&PM, TM->getTargetTriple(), TM->getTargetIRAnalysis());
12251225
if (emit_mc) {
12261226
raw_svector_ostream obj_OS(ObjBufferSV);
1227-
if (TM->addPassesToEmitFile(PM, obj_OS, nullptr, CGFT_ObjectFile, false, nullptr))
1227+
#if JL_LLVM_VERSION >= 180000
1228+
if (TM->addPassesToEmitFile(PM, obj_OS, nullptr, CodeGenFileType::ObjectFile, false, nullptr))
1229+
#else
1230+
if (TM->addPassesToEmitFile(PM, obj_OS, nullptr, CodeGenFileType::ObjectFile, false, nullptr))
1231+
#endif
12281232
return jl_an_empty_string;
12291233
TSM->withModuleDo([&](Module &m) { PM.run(m); });
12301234
}

0 commit comments

Comments
 (0)