diff options
Diffstat (limited to 'contrib/llvm-project/lld/ELF/Arch/RISCV.cpp')
| -rw-r--r-- | contrib/llvm-project/lld/ELF/Arch/RISCV.cpp | 6 |
1 files changed, 1 insertions, 5 deletions
diff --git a/contrib/llvm-project/lld/ELF/Arch/RISCV.cpp b/contrib/llvm-project/lld/ELF/Arch/RISCV.cpp index 6c478ad4109b..87887b314a5a 100644 --- a/contrib/llvm-project/lld/ELF/Arch/RISCV.cpp +++ b/contrib/llvm-project/lld/ELF/Arch/RISCV.cpp @@ -846,9 +846,7 @@ public: static void mergeArch(RISCVISAInfo::OrderedExtensionMap &mergedExts, unsigned &mergedXlen, const InputSectionBase *sec, StringRef s) { - auto maybeInfo = - RISCVISAInfo::parseArchString(s, /*EnableExperimentalExtension=*/true, - /*ExperimentalExtensionVersionCheck=*/true); + auto maybeInfo = RISCVISAInfo::parseNormalizedArchString(s); if (!maybeInfo) { errorOrWarn(toString(sec) + ": " + s + ": " + llvm::toString(maybeInfo.takeError())); @@ -863,8 +861,6 @@ static void mergeArch(RISCVISAInfo::OrderedExtensionMap &mergedExts, } else { for (const auto &ext : info.getExtensions()) { if (auto it = mergedExts.find(ext.first); it != mergedExts.end()) { - // TODO This is untested because RISCVISAInfo::parseArchString does not - // accept unsupported versions yet. if (std::tie(it->second.MajorVersion, it->second.MinorVersion) >= std::tie(ext.second.MajorVersion, ext.second.MinorVersion)) continue; |