================ @@ -6666,17 +6684,26 @@ void Clang::ConstructJob(Compilation &C, const JobAction &JA, break; } } else { + if (Args.hasFlag(options::OPT_foffload_via_llvm, + options::OPT_fno_offload_via_llvm, false)) + Args.AddLastArg(CmdArgs, options::OPT_fopenmp, options::OPT_fno_openmp); Args.AddLastArg(CmdArgs, options::OPT_fopenmp_simd, options::OPT_fno_openmp_simd); Args.AddAllArgs(CmdArgs, options::OPT_fopenmp_version_EQ); Args.addOptOutFlag(CmdArgs, options::OPT_fopenmp_extensions, options::OPT_fno_openmp_extensions); } - - // Forward the new driver to change offloading code generation. - if (Args.hasFlag(options::OPT_offload_new_driver, - options::OPT_no_offload_new_driver, false)) + // Forward the offload runtime change to code generation, liboffload implies + // new driver. Otherwise, check if we should forward the new driver to change + // offloading code generation. + if (Args.hasFlag(options::OPT_foffload_via_llvm, + options::OPT_fno_offload_via_llvm, false)) { CmdArgs.push_back("--offload-new-driver"); + CmdArgs.push_back("-foffload-via-llvm"); ---------------- Artem-B wrote:
Could be done via a single call to `CmdArgs.append({a,b,c,d})` https://github.com/llvm/llvm-project/pull/94549 _______________________________________________ cfe-commits mailing list cfe-commits@lists.llvm.org https://lists.llvm.org/cgi-bin/mailman/listinfo/cfe-commits