[clang] Fix missing clang changes for #151983 (PR #152066)

Justin Bogner via cfe-commits cfe-commits at lists.llvm.org
Mon Aug 4 19:14:13 PDT 2025


https://github.com/bogner created https://github.com/llvm/llvm-project/pull/152066

That change was missing the API update in clang.

>From ad866eef4ed90be4792e20cff4a2a206d987b452 Mon Sep 17 00:00:00 2001
From: Justin Bogner <mail at justinbogner.com>
Date: Mon, 4 Aug 2025 19:13:11 -0700
Subject: [PATCH] Fix missing clang changes for #151983

That change was missing the API update in clang.
---
 clang/lib/Driver/ToolChains/Clang.cpp | 8 +++-----
 1 file changed, 3 insertions(+), 5 deletions(-)

diff --git a/clang/lib/Driver/ToolChains/Clang.cpp b/clang/lib/Driver/ToolChains/Clang.cpp
index 4e1b1d9e33621..6eb77610079b7 100644
--- a/clang/lib/Driver/ToolChains/Clang.cpp
+++ b/clang/lib/Driver/ToolChains/Clang.cpp
@@ -1320,12 +1320,10 @@ void RenderARMABI(const Driver &D, const llvm::Triple &Triple,
   // FIXME: Support -meabi.
   // FIXME: Parts of this are duplicated in the backend, unify this somehow.
   const char *ABIName = nullptr;
-  if (Arg *A = Args.getLastArg(options::OPT_mabi_EQ)) {
+  if (Arg *A = Args.getLastArg(options::OPT_mabi_EQ))
     ABIName = A->getValue();
-  } else {
-    std::string CPU = getCPUName(D, Args, Triple, /*FromAs*/ false);
-    ABIName = llvm::ARM::computeDefaultTargetABI(Triple, CPU).data();
-  }
+  else
+    ABIName = llvm::ARM::computeDefaultTargetABI(Triple).data();
 
   CmdArgs.push_back("-target-abi");
   CmdArgs.push_back(ABIName);



More information about the cfe-commits mailing list