Skip to content

Commit c598676

Browse files
authored
Fix missing clang changes for #151983 (#152066)
That change was missing the API update in clang.
1 parent e848959 commit c598676

File tree

1 file changed

+3
-5
lines changed

1 file changed

+3
-5
lines changed

clang/lib/Driver/ToolChains/Clang.cpp

Lines changed: 3 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1320,12 +1320,10 @@ void RenderARMABI(const Driver &D, const llvm::Triple &Triple,
13201320
// FIXME: Support -meabi.
13211321
// FIXME: Parts of this are duplicated in the backend, unify this somehow.
13221322
const char *ABIName = nullptr;
1323-
if (Arg *A = Args.getLastArg(options::OPT_mabi_EQ)) {
1323+
if (Arg *A = Args.getLastArg(options::OPT_mabi_EQ))
13241324
ABIName = A->getValue();
1325-
} else {
1326-
std::string CPU = getCPUName(D, Args, Triple, /*FromAs*/ false);
1327-
ABIName = llvm::ARM::computeDefaultTargetABI(Triple, CPU).data();
1328-
}
1325+
else
1326+
ABIName = llvm::ARM::computeDefaultTargetABI(Triple).data();
13291327

13301328
CmdArgs.push_back("-target-abi");
13311329
CmdArgs.push_back(ABIName);

0 commit comments

Comments
 (0)