From: Krzysztof Parzyszek Date: Fri, 7 Jan 2022 20:45:22 +0000 (-0800) Subject: [Hexagon] Use map from HexagonDepArch instead of local one, NFC X-Git-Tag: upstream/15.0.7~21257 X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=07ecb987987b2b099d656ccac3da922bd7321a83;p=platform%2Fupstream%2Fllvm.git [Hexagon] Use map from HexagonDepArch instead of local one, NFC Co-authored-by: Brian Cain --- diff --git a/llvm/lib/Target/Hexagon/MCTargetDesc/HexagonMCTargetDesc.cpp b/llvm/lib/Target/Hexagon/MCTargetDesc/HexagonMCTargetDesc.cpp index fd85e1e..6a08d75 100644 --- a/llvm/lib/Target/Hexagon/MCTargetDesc/HexagonMCTargetDesc.cpp +++ b/llvm/lib/Target/Hexagon/MCTargetDesc/HexagonMCTargetDesc.cpp @@ -559,21 +559,11 @@ void Hexagon_MC::addArchSubtarget(MCSubtargetInfo const *STI, } unsigned Hexagon_MC::GetELFFlags(const MCSubtargetInfo &STI) { - static std::map ElfFlags = { - {"hexagonv5", ELF::EF_HEXAGON_MACH_V5}, - {"hexagonv55", ELF::EF_HEXAGON_MACH_V55}, - {"hexagonv60", ELF::EF_HEXAGON_MACH_V60}, - {"hexagonv62", ELF::EF_HEXAGON_MACH_V62}, - {"hexagonv65", ELF::EF_HEXAGON_MACH_V65}, - {"hexagonv66", ELF::EF_HEXAGON_MACH_V66}, - {"hexagonv67", ELF::EF_HEXAGON_MACH_V67}, - {"hexagonv67t", ELF::EF_HEXAGON_MACH_V67T}, - {"hexagonv68", ELF::EF_HEXAGON_MACH_V68}, - {"hexagonv69", ELF::EF_HEXAGON_MACH_V69}, - }; + using llvm::Hexagon::ElfFlagsByCpuStr; - auto F = ElfFlags.find(STI.getCPU()); - assert(F != ElfFlags.end() && "Unrecognized Architecture"); + const std::string CPU(STI.getCPU().str()); + auto F = ElfFlagsByCpuStr.find(CPU); + assert(F != ElfFlagsByCpuStr.end() && "Unrecognized Architecture"); return F->second; }