diff options
| author | Dimitry Andric <dim@FreeBSD.org> | 2022-03-20 11:40:34 +0000 |
|---|---|---|
| committer | Dimitry Andric <dim@FreeBSD.org> | 2022-05-14 11:43:05 +0000 |
| commit | 349cc55c9796c4596a5b9904cd3281af295f878f (patch) | |
| tree | 410c5a785075730a35f1272ca6a7adf72222ad03 /contrib/llvm-project/clang/lib/Basic/Targets/AVR.cpp | |
| parent | cb2ae6163174b90e999326ecec3699ee093a5d43 (diff) | |
| parent | c0981da47d5696fe36474fcf86b4ce03ae3ff818 (diff) | |
Merge llvm-project main llvmorg-14-init-10186-gff7f2cfa959b
This updates llvm, clang, compiler-rt, libc++, libunwind, lld, lldb and
openmp to llvmorg-14-init-10186-gff7f2cfa959b.
PR: 261742
MFC after: 2 weeks
Diffstat (limited to 'contrib/llvm-project/clang/lib/Basic/Targets/AVR.cpp')
| -rw-r--r-- | contrib/llvm-project/clang/lib/Basic/Targets/AVR.cpp | 38 |
1 files changed, 30 insertions, 8 deletions
diff --git a/contrib/llvm-project/clang/lib/Basic/Targets/AVR.cpp b/contrib/llvm-project/clang/lib/Basic/Targets/AVR.cpp index e87b7338c4d6..50b0fc07b311 100644 --- a/contrib/llvm-project/clang/lib/Basic/Targets/AVR.cpp +++ b/contrib/llvm-project/clang/lib/Basic/Targets/AVR.cpp @@ -223,7 +223,7 @@ static MCUInfo AVRMcus[] = { {"atmega256rfr2", "__AVR_ATmega256RFR2__"}, {"atmega2564rfr2", "__AVR_ATmega2564RFR2__"}, {"atxmega16a4", "__AVR_ATxmega16A4__"}, - {"atxmega16a4u", "__AVR_ATxmega16a4U__"}, + {"atxmega16a4u", "__AVR_ATxmega16A4U__"}, {"atxmega16c4", "__AVR_ATxmega16C4__"}, {"atxmega16d4", "__AVR_ATxmega16D4__"}, {"atxmega32a4", "__AVR_ATxmega32A4__"}, @@ -265,7 +265,7 @@ static MCUInfo AVRMcus[] = { {"atxmega384d3", "__AVR_ATxmega384D3__"}, {"atxmega128a1", "__AVR_ATxmega128A1__"}, {"atxmega128a1u", "__AVR_ATxmega128A1U__"}, - {"atxmega128a4u", "__AVR_ATxmega128a4U__"}, + {"atxmega128a4u", "__AVR_ATxmega128A4U__"}, {"attiny4", "__AVR_ATtiny4__"}, {"attiny5", "__AVR_ATtiny5__"}, {"attiny9", "__AVR_ATtiny9__"}, @@ -274,6 +274,31 @@ static MCUInfo AVRMcus[] = { {"attiny40", "__AVR_ATtiny40__"}, {"attiny102", "__AVR_ATtiny102__"}, {"attiny104", "__AVR_ATtiny104__"}, + {"attiny202", "__AVR_ATtiny202__"}, + {"attiny402", "__AVR_ATtiny402__"}, + {"attiny204", "__AVR_ATtiny204__"}, + {"attiny404", "__AVR_ATtiny404__"}, + {"attiny804", "__AVR_ATtiny804__"}, + {"attiny1604", "__AVR_ATtiny1604__"}, + {"attiny406", "__AVR_ATtiny406__"}, + {"attiny806", "__AVR_ATtiny806__"}, + {"attiny1606", "__AVR_ATtiny1606__"}, + {"attiny807", "__AVR_ATtiny807__"}, + {"attiny1607", "__AVR_ATtiny1607__"}, + {"attiny212", "__AVR_ATtiny212__"}, + {"attiny412", "__AVR_ATtiny412__"}, + {"attiny214", "__AVR_ATtiny214__"}, + {"attiny414", "__AVR_ATtiny414__"}, + {"attiny814", "__AVR_ATtiny814__"}, + {"attiny1614", "__AVR_ATtiny1614__"}, + {"attiny416", "__AVR_ATtiny416__"}, + {"attiny816", "__AVR_ATtiny816__"}, + {"attiny1616", "__AVR_ATtiny1616__"}, + {"attiny3216", "__AVR_ATtiny3216__"}, + {"attiny417", "__AVR_ATtiny417__"}, + {"attiny817", "__AVR_ATtiny817__"}, + {"attiny1617", "__AVR_ATtiny1617__"}, + {"attiny3217", "__AVR_ATtiny3217__"}, }; } // namespace targets @@ -286,13 +311,10 @@ static constexpr llvm::StringLiteral ValidFamilyNames[] = { "avrxmega6", "avrxmega7", "avrtiny"}; bool AVRTargetInfo::isValidCPUName(StringRef Name) const { - bool IsFamily = - llvm::find(ValidFamilyNames, Name) != std::end(ValidFamilyNames); + bool IsFamily = llvm::is_contained(ValidFamilyNames, Name); - bool IsMCU = - llvm::find_if(AVRMcus, [&](const MCUInfo &Info) { - return Info.Name == Name; - }) != std::end(AVRMcus); + bool IsMCU = llvm::any_of( + AVRMcus, [&](const MCUInfo &Info) { return Info.Name == Name; }); return IsFamily || IsMCU; } |