Cold-Air-Networks/mirror-llvm-project
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions 7

[𝘀𝗽𝗿] changes introduced through rebase

Browse source 
Created using spr 1.3.8-beta.1-arichardson

[skip ci]
This commit is contained in:
Alexander Richardson 2026-07-31 23:16:03 -07:00
parent 733727da92
commit a77fad1bd0
3 changed files with 7 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
llvm/lib/Target/RISCV/MCTargetDesc/RISCVBaseInfo.cpp
View file

@ -89,11 +89,9 @@ Expected<ABI> computeTargetABI(const MCSubtargetInfo &STI, StringRef ABIName) {
}
if (!IsRV64 && IsRVE && IsXCheriot && TargetABI != ABI_CHERIOT &&
TargetABI != ABI_Unknown) {
return createStringError(
"only the cheriot ABI is supported for XCheriot");
return createStringError("only the cheriot ABI is supported for XCheriot");
}
if (IsRV64 && IsRVE && TargetABI != ABI_LP64E &&
TargetABI != ABI_Unknown) {
if (IsRV64 && IsRVE && TargetABI != ABI_LP64E && TargetABI != ABI_Unknown) {
return createStringError("only the lp64e ABI is supported for RV64E");
}

8
llvm/lib/Target/RISCV/RISCVISelLowering.cpp
View file

@ -140,11 +140,11 @@ RISCVTargetLowering::RISCVTargetLowering(const TargetMachine &TM,
// Hard-float ABIs that don't match the F/D extensions are already rejected
// by RISCVABI::computeTargetABI() when the subtarget is constructed.
assert(((ABI != RISCVABI::ABI_ILP32F && ABI != RISCVABI::ABI_LP64F) ||
Subtarget.hasStdExtF()) &&
"F ABI without F extension");
Subtarget.hasStdExtF()) &&
"F ABI without F extension");
assert(((ABI != RISCVABI::ABI_ILP32D && ABI != RISCVABI::ABI_LP64D) ||
Subtarget.hasStdExtD()) &&
"D ABI without D extension");
Subtarget.hasStdExtD()) &&
"D ABI without D extension");
switch (ABI) {
default:

3
llvm/unittests/Target/RISCV/RISCVBaseInfoTest.cpp
View file

@ -40,8 +40,7 @@ RISCVABI::ABI computeTargetABI(StringRef TripleName, StringRef FeatureStr,
std::string computeTargetABIError(StringRef TripleName, StringRef FeatureStr,
StringRef ABIName) {
auto STI = createSTI(TripleName, FeatureStr);
Expected<RISCVABI::ABI> Result =
RISCVABI::computeTargetABI(*STI, ABIName);
Expected<RISCVABI::ABI> Result = RISCVABI::computeTargetABI(*STI, ABIName);
if (Result) {
ADD_FAILURE() << "expected an error for -target-abi " << ABIName;
return {};