https://github.com/arsenm created https://github.com/llvm/llvm-project/pull/168110
After the base branch was moved to main, this somehow ended up adding a second definition of RTLCI, instead of modifying the existing one. Also fix other build error with gcc bots. >From cac3e7b11d7bf756cc415625ae509d1efd15c2c9 Mon Sep 17 00:00:00 2001 From: Matt Arsenault <[email protected]> Date: Fri, 14 Nov 2025 11:43:22 -0800 Subject: [PATCH] opt: Fix bad merge of #167996 After the base branch was moved to main, this somehow ended up adding a second definition of RTLCI, instead of modifying the existing one. Also fix other build error with gcc bots. --- clang/lib/CodeGen/BackendUtil.cpp | 18 +++++++++--------- llvm/include/llvm/Target/TargetOptions.h | 2 +- llvm/lib/CodeGen/CommandFlags.cpp | 2 +- llvm/tools/opt/optdriver.cpp | 5 ----- 4 files changed, 11 insertions(+), 16 deletions(-) diff --git a/clang/lib/CodeGen/BackendUtil.cpp b/clang/lib/CodeGen/BackendUtil.cpp index f1e20403ad668..6f63e6470270e 100644 --- a/clang/lib/CodeGen/BackendUtil.cpp +++ b/clang/lib/CodeGen/BackendUtil.cpp @@ -483,31 +483,31 @@ static bool initTargetOptions(const CompilerInstance &CI, switch (CodeGenOpts.getVecLib()) { case llvm::driver::VectorLibrary::NoLibrary: - Options.VectorLibrary = llvm::VectorLibrary::NoLibrary; + Options.VecLib = llvm::VectorLibrary::NoLibrary; break; case llvm::driver::VectorLibrary::Accelerate: - Options.VectorLibrary = llvm::VectorLibrary::Accelerate; + Options.VecLib = llvm::VectorLibrary::Accelerate; break; case llvm::driver::VectorLibrary::Darwin_libsystem_m: - Options.VectorLibrary = llvm::VectorLibrary::DarwinLibSystemM; + Options.VecLib = llvm::VectorLibrary::DarwinLibSystemM; break; case llvm::driver::VectorLibrary::LIBMVEC: - Options.VectorLibrary = llvm::VectorLibrary::LIBMVEC; + Options.VecLib = llvm::VectorLibrary::LIBMVEC; break; case llvm::driver::VectorLibrary::MASSV: - Options.VectorLibrary = llvm::VectorLibrary::MASSV; + Options.VecLib = llvm::VectorLibrary::MASSV; break; case llvm::driver::VectorLibrary::SVML: - Options.VectorLibrary = llvm::VectorLibrary::SVML; + Options.VecLib = llvm::VectorLibrary::SVML; break; case llvm::driver::VectorLibrary::SLEEF: - Options.VectorLibrary = llvm::VectorLibrary::SLEEFGNUABI; + Options.VecLib = llvm::VectorLibrary::SLEEFGNUABI; break; case llvm::driver::VectorLibrary::ArmPL: - Options.VectorLibrary = llvm::VectorLibrary::ArmPL; + Options.VecLib = llvm::VectorLibrary::ArmPL; break; case llvm::driver::VectorLibrary::AMDLIBM: - Options.VectorLibrary = llvm::VectorLibrary::AMDLIBM; + Options.VecLib = llvm::VectorLibrary::AMDLIBM; break; } diff --git a/llvm/include/llvm/Target/TargetOptions.h b/llvm/include/llvm/Target/TargetOptions.h index b9258c0fee692..0312515d11798 100644 --- a/llvm/include/llvm/Target/TargetOptions.h +++ b/llvm/include/llvm/Target/TargetOptions.h @@ -411,7 +411,7 @@ class TargetOptions { DebuggerKind DebuggerTuning = DebuggerKind::Default; /// Vector math library to use. - VectorLibrary VectorLibrary = VectorLibrary::NoLibrary; + VectorLibrary VecLib = VectorLibrary::NoLibrary; private: /// Flushing mode to assume in default FP environment. diff --git a/llvm/lib/CodeGen/CommandFlags.cpp b/llvm/lib/CodeGen/CommandFlags.cpp index 02a6bb9357ad0..8f92ee30e221a 100644 --- a/llvm/lib/CodeGen/CommandFlags.cpp +++ b/llvm/lib/CodeGen/CommandFlags.cpp @@ -632,7 +632,7 @@ codegen::InitTargetOptionsFromCodeGenFlags(const Triple &TheTriple) { Options.EnableTLSDESC = getExplicitEnableTLSDESC().value_or(TheTriple.hasDefaultTLSDESC()); Options.ExceptionModel = getExceptionModel(); - Options.VectorLibrary = getVectorLibrary(); + Options.VecLib = getVectorLibrary(); Options.EmitStackSizeSection = getEnableStackSizeSection(); Options.EnableMachineFunctionSplitter = getEnableMachineFunctionSplitter(); Options.EnableStaticDataPartitioning = getEnableStaticDataPartitioning(); diff --git a/llvm/tools/opt/optdriver.cpp b/llvm/tools/opt/optdriver.cpp index c65cae54b9530..d24c8abef31d0 100644 --- a/llvm/tools/opt/optdriver.cpp +++ b/llvm/tools/opt/optdriver.cpp @@ -680,11 +680,6 @@ optMain(int argc, char **argv, "", // FIXME: Get ABI name from MCOptions VecLib); - // FIXME: Get ABI name from MCOptions - RTLIB::RuntimeLibcallsInfo RTLCI(ModuleTriple, codegen::getExceptionModel(), - codegen::getFloatABIForCalls(), - codegen::getEABIVersion()); - // The -disable-simplify-libcalls flag actually disables all builtin optzns. if (DisableSimplifyLibCalls) TLII.disableAllFunctions(); _______________________________________________ cfe-commits mailing list [email protected] https://lists.llvm.org/cgi-bin/mailman/listinfo/cfe-commits
