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

[via cfe-commits]

Author: Justin Bogner
Date: 2025-08-04T19:14:17-07:00
New Revision: c5986765dc708d682deb2cdf62f5e16df737179b

URL: https://github.com/llvm/llvm-project/commit/c5986765dc708d682deb2cdf62f5e16df737179b
DIFF: https://github.com/llvm/llvm-project/commit/c5986765dc708d682deb2cdf62f5e16df737179b.diff

LOG: Fix missing clang changes for #151983 (#152066)

That change was missing the API update in clang.

Added: 
    

Modified: 
    clang/lib/Driver/ToolChains/Clang.cpp

Removed: 
    


################################################################################
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);