Skip to content

Commit ae2811c

Browse files
committed
Update CGFT_*File to CodeGenFileType
See llvm/llvm-project#66295
1 parent 890f6f7 commit ae2811c

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
@@ -1168,7 +1168,11 @@ static AOTOutputs add_output_impl(Module &M, TargetMachine &SourceTM, ShardTimer
11681168
raw_svector_ostream OS(out.obj);
11691169
legacy::PassManager emitter;
11701170
addTargetPasses(&emitter, TM->getTargetTriple(), TM->getTargetIRAnalysis());
1171+
#if JL_LLVM_VERSION >= 180000
1172+
if (TM->addPassesToEmitFile(emitter, OS, nullptr, CodeGenFileType::ObjectFile, false))
1173+
#else
11711174
if (TM->addPassesToEmitFile(emitter, OS, nullptr, CGFT_ObjectFile, false))
1175+
#endif
11721176
jl_safe_printf("ERROR: target does not support generation of object files\n");
11731177
emitter.run(M);
11741178
timers.obj.stopTimer();
@@ -1179,7 +1183,7 @@ static AOTOutputs add_output_impl(Module &M, TargetMachine &SourceTM, ShardTimer
11791183
raw_svector_ostream OS(out.asm_);
11801184
legacy::PassManager emitter;
11811185
addTargetPasses(&emitter, TM->getTargetTriple(), TM->getTargetIRAnalysis());
1182-
if (TM->addPassesToEmitFile(emitter, OS, nullptr, CGFT_AssemblyFile, false))
1186+
if (TM->addPassesToEmitFile(emitter, OS, nullptr, CodeGenFileType::AssemblyFile, false))
11831187
jl_safe_printf("ERROR: target does not support generation of assembly files\n");
11841188
emitter.run(M);
11851189
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)