diff --git a/clang/lib/Basic/Targets/AVR.cpp b/clang/lib/Basic/Targets/AVR.cpp --- a/clang/lib/Basic/Targets/AVR.cpp +++ b/clang/lib/Basic/Targets/AVR.cpp @@ -27,7 +27,7 @@ const int NumFlashBanks; // -1 means the device does not support LPM/ELPM. }; -// This list should be kept up-to-date with AVRDevices.td in LLVM. +// NOTE: This list has been synchronized with gcc-avr 5.4.0 and avr-libc 2.0.0. static MCUInfo AVRMcus[] = { {"at90s1200", "__AVR_AT90S1200__", 0}, {"attiny11", "__AVR_ATtiny11__", 0}, @@ -83,6 +83,8 @@ {"at90usb82", "__AVR_AT90USB82__", 1}, {"at90usb162", "__AVR_AT90USB162__", 1}, {"ata5505", "__AVR_ATA5505__", 1}, + {"ata6617c", "__AVR_ATA6617C__", 1}, + {"ata664251", "__AVR_ATA664251__", 1}, {"atmega8u2", "__AVR_ATmega8U2__", 1}, {"atmega16u2", "__AVR_ATmega16U2__", 1}, {"atmega32u2", "__AVR_ATmega32U2__", 1}, @@ -92,6 +94,7 @@ {"atmega8a", "__AVR_ATmega8A__", 1}, {"ata6285", "__AVR_ATA6285__", 1}, {"ata6286", "__AVR_ATA6286__", 1}, + {"ata6612c", "__AVR_ATA6612C__", 1}, {"atmega48", "__AVR_ATmega48__", 1}, {"atmega48a", "__AVR_ATmega48A__", 1}, {"atmega48pa", "__AVR_ATmega48PA__", 1}, @@ -111,8 +114,17 @@ {"at90pwm3", "__AVR_AT90PWM3__", 1}, {"at90pwm3b", "__AVR_AT90PWM3B__", 1}, {"at90pwm81", "__AVR_AT90PWM81__", 1}, + {"ata5702m322", "__AVR_ATA5702M322__", 1}, + {"ata5782", "__AVR_ATA5782__", 1}, {"ata5790", "__AVR_ATA5790__", 1}, + {"ata5790n", "__AVR_ATA5790N__", 1}, + {"ata5791", "__AVR_ATA5791__", 1}, {"ata5795", "__AVR_ATA5795__", 1}, + {"ata5831", "__AVR_ATA5831__", 1}, + {"ata6613c", "__AVR_ATA6613C__", 1}, + {"ata6614q", "__AVR_ATA6614Q__", 1}, + {"ata8210", "__AVR_ATA8210__", 1}, + {"ata8510", "__AVR_ATA8510__", 1}, {"atmega16", "__AVR_ATmega16__", 1}, {"atmega16a", "__AVR_ATmega16A__", 1}, {"atmega161", "__AVR_ATmega161__", 1}, @@ -189,6 +201,7 @@ {"atmega32hvb", "__AVR_ATmega32HVB__", 1}, {"atmega32hvbrevb", "__AVR_ATmega32HVBREVB__", 1}, {"atmega64hve", "__AVR_ATmega64HVE__", 1}, + {"atmega64hve2", "__AVR_ATmega64HVE2__", 1}, {"at90can32", "__AVR_AT90CAN32__", 1}, {"at90can64", "__AVR_AT90CAN64__", 1}, {"at90pwm161", "__AVR_AT90PWM161__", 1}, @@ -229,7 +242,9 @@ {"atxmega16d4", "__AVR_ATxmega16D4__", 1}, {"atxmega32a4", "__AVR_ATxmega32A4__", 1}, {"atxmega32a4u", "__AVR_ATxmega32A4U__", 1}, + {"atxmega32c3", "__AVR_ATxmega32C3__", 1}, {"atxmega32c4", "__AVR_ATxmega32C4__", 1}, + {"atxmega32d3", "__AVR_ATxmega32D3__", 1}, {"atxmega32d4", "__AVR_ATxmega32D4__", 1}, {"atxmega32e5", "__AVR_ATxmega32E5__", 1}, {"atxmega16e5", "__AVR_ATxmega16E5__", 1}, diff --git a/clang/lib/Driver/ToolChains/AVR.cpp b/clang/lib/Driver/ToolChains/AVR.cpp --- a/clang/lib/Driver/ToolChains/AVR.cpp +++ b/clang/lib/Driver/ToolChains/AVR.cpp @@ -28,6 +28,7 @@ namespace { +// NOTE: This list has been synchronized with gcc-avr 5.4.0 and avr-libc 2.0.0. constexpr struct { StringRef Name; StringRef SubPath; @@ -88,6 +89,8 @@ {"at90usb82", "avr35", "avr35", 0x800100}, {"at90usb162", "avr35", "avr35", 0x800100}, {"ata5505", "avr35", "avr35", 0x800100}, + {"ata6617c", "avr35", "avr35", 0x800100}, + {"ata664251", "avr35", "avr35", 0x800100}, {"atmega8u2", "avr35", "avr35", 0x800100}, {"atmega16u2", "avr35", "avr35", 0x800100}, {"atmega32u2", "avr35", "avr35", 0x800100}, @@ -97,6 +100,7 @@ {"atmega8a", "avr4", "avr4", 0x800060}, {"ata6285", "avr4", "avr4", 0x800100}, {"ata6286", "avr4", "avr4", 0x800100}, + {"ata6612c", "avr4", "avr4", 0x800100}, {"atmega48", "avr4", "avr4", 0x800100}, {"atmega48a", "avr4", "avr4", 0x800100}, {"atmega48pa", "avr4", "avr4", 0x800100}, @@ -116,8 +120,17 @@ {"at90pwm3", "avr4", "avr4", 0x800100}, {"at90pwm3b", "avr4", "avr4", 0x800100}, {"at90pwm81", "avr4", "avr4", 0x800100}, + {"ata5702m322", "avr5", "avr5", 0x800200}, + {"ata5782", "avr5", "avr5", 0x800200}, {"ata5790", "avr5", "avr5", 0x800100}, + {"ata5790n", "avr5", "avr5", 0x800100}, + {"ata5791", "avr5", "avr5", 0x800100}, {"ata5795", "avr5", "avr5", 0x800100}, + {"ata5831", "avr5", "avr5", 0x800200}, + {"ata6613c", "avr5", "avr5", 0x800100}, + {"ata6614q", "avr5", "avr5", 0x800100}, + {"ata8210", "avr5", "avr5", 0x800200}, + {"ata8510", "avr5", "avr5", 0x800200}, {"atmega16", "avr5", "avr5", 0x800060}, {"atmega16a", "avr5", "avr5", 0x800060}, {"atmega161", "avr5", "avr5", 0x800060}, @@ -192,6 +205,7 @@ {"atmega32hvb", "avr5", "avr5", 0x800100}, {"atmega32hvbrevb", "avr5", "avr5", 0x800100}, {"atmega64hve", "avr5", "avr5", 0x800100}, + {"atmega64hve2", "avr5", "avr5", 0x800100}, {"at90can32", "avr5", "avr5", 0x800100}, {"at90can64", "avr5", "avr5", 0x800100}, {"at90pwm161", "avr5", "avr5", 0x800100}, @@ -238,11 +252,14 @@ {"atxmega16d4", "avrxmega2", "avrxmega2", 0x802000}, {"atxmega32a4", "avrxmega2", "avrxmega2", 0x802000}, {"atxmega32a4u", "avrxmega2", "avrxmega2", 0x802000}, + {"atxmega32c3", "avrxmega2", "avrxmega2", 0x802000}, {"atxmega32c4", "avrxmega2", "avrxmega2", 0x802000}, + {"atxmega32d3", "avrxmega2", "avrxmega2", 0x802000}, {"atxmega32d4", "avrxmega2", "avrxmega2", 0x802000}, {"atxmega32e5", "avrxmega2", "avrxmega2", 0x802000}, {"atxmega16e5", "avrxmega2", "avrxmega2", 0x802000}, {"atxmega8e5", "avrxmega2", "avrxmega2", 0x802000}, + {"atxmega64a3", "avrxmega4", "avrxmega4", 0x802000}, {"atxmega64a3u", "avrxmega4", "avrxmega4", 0x802000}, {"atxmega64a4u", "avrxmega4", "avrxmega4", 0x802000}, {"atxmega64b1", "avrxmega4", "avrxmega4", 0x802000}, diff --git a/clang/test/Misc/target-invalid-cpu-note.c b/clang/test/Misc/target-invalid-cpu-note.c --- a/clang/test/Misc/target-invalid-cpu-note.c +++ b/clang/test/Misc/target-invalid-cpu-note.c @@ -77,7 +77,7 @@ // RUN: not %clang_cc1 -triple avr--- -target-cpu not-a-cpu -fsyntax-only %s 2>&1 | FileCheck %s --check-prefix AVR // AVR: error: unknown target CPU 'not-a-cpu' -// AVR-NEXT: note: valid target CPU values are: avr1, avr2, avr25, avr3, avr31, avr35, avr4, avr5, avr51, avr6, avrxmega1, avrxmega2, avrxmega3, avrxmega4, avrxmega5, avrxmega6, avrxmega7, avrtiny, at90s1200, attiny11, attiny12, attiny15, attiny28, at90s2313, at90s2323, at90s2333, at90s2343, attiny22, attiny26, at86rf401, at90s4414, at90s4433, at90s4434, at90s8515, at90c8534, at90s8535, ata5272, attiny13, attiny13a, attiny2313, attiny2313a, attiny24, attiny24a, attiny4313, attiny44, attiny44a, attiny84, attiny84a, attiny25, attiny45, attiny85, attiny261, attiny261a, attiny441, attiny461, attiny461a, attiny841, attiny861, attiny861a, attiny87, attiny43u, attiny48, attiny88, attiny828, at43usb355, at76c711, atmega103, at43usb320, attiny167, at90usb82, at90usb162, ata5505, atmega8u2, atmega16u2, atmega32u2, attiny1634, atmega8, ata6289, atmega8a, ata6285, ata6286, atmega48, atmega48a, atmega48pa, atmega48pb, atmega48p, atmega88, atmega88a, atmega88p, atmega88pa, atmega88pb, atmega8515, atmega8535, atmega8hva, at90pwm1, at90pwm2, at90pwm2b, at90pwm3, at90pwm3b, at90pwm81, ata5790, ata5795, atmega16, atmega16a, atmega161, atmega162, atmega163, atmega164a, atmega164p, atmega164pa, atmega165, atmega165a, atmega165p, atmega165pa, atmega168, atmega168a, atmega168p, atmega168pa, atmega168pb, atmega169, atmega169a, atmega169p, atmega169pa, atmega32, atmega32a, atmega323, atmega324a, atmega324p, atmega324pa, atmega324pb, atmega325, atmega325a, atmega325p, atmega325pa, atmega3250, atmega3250a, atmega3250p, atmega3250pa, atmega328, atmega328p, atmega328pb, atmega329, atmega329a, atmega329p, atmega329pa, atmega3290, atmega3290a, atmega3290p, atmega3290pa, atmega406, atmega64, atmega64a, atmega640, atmega644, atmega644a, atmega644p, atmega644pa, atmega645, atmega645a, atmega645p, atmega649, atmega649a, atmega649p, atmega6450, atmega6450a, atmega6450p, atmega6490, atmega6490a, atmega6490p, atmega64rfr2, atmega644rfr2, atmega16hva, atmega16hva2, atmega16hvb, atmega16hvbrevb, atmega32hvb, atmega32hvbrevb, atmega64hve, at90can32, at90can64, at90pwm161, at90pwm216, at90pwm316, atmega32c1, atmega64c1, atmega16m1, atmega32m1, atmega64m1, atmega16u4, atmega32u4, atmega32u6, at90usb646, at90usb647, at90scr100, at94k, m3000, atmega128, atmega128a, atmega1280, atmega1281, atmega1284, atmega1284p, atmega128rfa1, atmega128rfr2, atmega1284rfr2, at90can128, at90usb1286, at90usb1287, atmega2560, atmega2561, atmega256rfr2, atmega2564rfr2, atxmega16a4, atxmega16a4u, atxmega16c4, atxmega16d4, atxmega32a4, atxmega32a4u, atxmega32c4, atxmega32d4, atxmega32e5, atxmega16e5, atxmega8e5, atxmega32x1, atxmega64a3, atxmega64a3u, atxmega64a4u, atxmega64b1, atxmega64b3, atxmega64c3, atxmega64d3, atxmega64d4, atxmega64a1, atxmega64a1u, atxmega128a3, atxmega128a3u, atxmega128b1, atxmega128b3, atxmega128c3, atxmega128d3, atxmega128d4, atxmega192a3, atxmega192a3u, atxmega192c3, atxmega192d3, atxmega256a3, atxmega256a3u, atxmega256a3b, atxmega256a3bu, atxmega256c3, atxmega256d3, atxmega384c3, atxmega384d3, atxmega128a1, atxmega128a1u, atxmega128a4u, attiny4, attiny5, attiny9, attiny10, attiny20, attiny40, attiny102, attiny104, attiny202, attiny402, attiny204, attiny404, attiny804, attiny1604, attiny406, attiny806, attiny1606, attiny807, attiny1607, attiny212, attiny412, attiny214, attiny414, attiny814, attiny1614, attiny416, attiny816, attiny1616, attiny3216, attiny417, attiny817, attiny1617, attiny3217{{$}} +// AVR-NEXT: note: valid target CPU values are: avr1, avr2, avr25, avr3, avr31, avr35, avr4, avr5, avr51, avr6, avrxmega1, avrxmega2, avrxmega3, avrxmega4, avrxmega5, avrxmega6, avrxmega7, avrtiny, at90s1200, attiny11, attiny12, attiny15, attiny28, at90s2313, at90s2323, at90s2333, at90s2343, attiny22, attiny26, at86rf401, at90s4414, at90s4433, at90s4434, at90s8515, at90c8534, at90s8535, ata5272, attiny13, attiny13a, attiny2313, attiny2313a, attiny24, attiny24a, attiny4313, attiny44, attiny44a, attiny84, attiny84a, attiny25, attiny45, attiny85, attiny261, attiny261a, attiny441, attiny461, attiny461a, attiny841, attiny861, attiny861a, attiny87, attiny43u, attiny48, attiny88, attiny828, at43usb355, at76c711, atmega103, at43usb320, attiny167, at90usb82, at90usb162, ata5505, ata6617c, ata664251, atmega8u2, atmega16u2, atmega32u2, attiny1634, atmega8, ata6289, atmega8a, ata6285, ata6286, ata6612c, atmega48, atmega48a, atmega48pa, atmega48pb, atmega48p, atmega88, atmega88a, atmega88p, atmega88pa, atmega88pb, atmega8515, atmega8535, atmega8hva, at90pwm1, at90pwm2, at90pwm2b, at90pwm3, at90pwm3b, at90pwm81, ata5702m322, ata5782, ata5790, ata5790n, ata5791, ata5795, ata5831, ata6613c, ata6614q, ata8210, ata8510, atmega16, atmega16a, atmega161, atmega162, atmega163, atmega164a, atmega164p, atmega164pa, atmega165, atmega165a, atmega165p, atmega165pa, atmega168, atmega168a, atmega168p, atmega168pa, atmega168pb, atmega169, atmega169a, atmega169p, atmega169pa, atmega32, atmega32a, atmega323, atmega324a, atmega324p, atmega324pa, atmega324pb, atmega325, atmega325a, atmega325p, atmega325pa, atmega3250, atmega3250a, atmega3250p, atmega3250pa, atmega328, atmega328p, atmega328pb, atmega329, atmega329a, atmega329p, atmega329pa, atmega3290, atmega3290a, atmega3290p, atmega3290pa, atmega406, atmega64, atmega64a, atmega640, atmega644, atmega644a, atmega644p, atmega644pa, atmega645, atmega645a, atmega645p, atmega649, atmega649a, atmega649p, atmega6450, atmega6450a, atmega6450p, atmega6490, atmega6490a, atmega6490p, atmega64rfr2, atmega644rfr2, atmega16hva, atmega16hva2, atmega16hvb, atmega16hvbrevb, atmega32hvb, atmega32hvbrevb, atmega64hve, atmega64hve2, at90can32, at90can64, at90pwm161, at90pwm216, at90pwm316, atmega32c1, atmega64c1, atmega16m1, atmega32m1, atmega64m1, atmega16u4, atmega32u4, atmega32u6, at90usb646, at90usb647, at90scr100, at94k, m3000, atmega128, atmega128a, atmega1280, atmega1281, atmega1284, atmega1284p, atmega128rfa1, atmega128rfr2, atmega1284rfr2, at90can128, at90usb1286, at90usb1287, atmega2560, atmega2561, atmega256rfr2, atmega2564rfr2, atxmega16a4, atxmega16a4u, atxmega16c4, atxmega16d4, atxmega32a4, atxmega32a4u, atxmega32c3, atxmega32c4, atxmega32d3, atxmega32d4, atxmega32e5, atxmega16e5, atxmega8e5, atxmega32x1, atxmega64a3, atxmega64a3u, atxmega64a4u, atxmega64b1, atxmega64b3, atxmega64c3, atxmega64d3, atxmega64d4, atxmega64a1, atxmega64a1u, atxmega128a3, atxmega128a3u, atxmega128b1, atxmega128b3, atxmega128c3, atxmega128d3, atxmega128d4, atxmega192a3, atxmega192a3u, atxmega192c3, atxmega192d3, atxmega256a3, atxmega256a3u, atxmega256a3b, atxmega256a3bu, atxmega256c3, atxmega256d3, atxmega384c3, atxmega384d3, atxmega128a1, atxmega128a1u, atxmega128a4u, attiny4, attiny5, attiny9, attiny10, attiny20, attiny40, attiny102, attiny104, attiny202, attiny402, attiny204, attiny404, attiny804, attiny1604, attiny406, attiny806, attiny1606, attiny807, attiny1607, attiny212, attiny412, attiny214, attiny414, attiny814, attiny1614, attiny416, attiny816, attiny1616, attiny3216, attiny417, attiny817, attiny1617, attiny3217 // RUN: not %clang_cc1 -triple riscv32 -target-cpu not-a-cpu -fsyntax-only %s 2>&1 | FileCheck %s --check-prefix RISCV32 // RISCV32: error: unknown target CPU 'not-a-cpu' diff --git a/llvm/lib/Target/AVR/AVRDevices.td b/llvm/lib/Target/AVR/AVRDevices.td --- a/llvm/lib/Target/AVR/AVRDevices.td +++ b/llvm/lib/Target/AVR/AVRDevices.td @@ -245,6 +245,7 @@ def : Device<"avrtiny", FamilyTiny, ELFArchTiny>; // Specific MCUs +// NOTE: This list has been synchronized with gcc-avr 5.4.0 and avr-libc 2.0.0. def : Device<"at90s1200", FamilyAVR0, ELFArchAVR1>; def : Device<"attiny11", FamilyAVR1, ELFArchAVR1>; def : Device<"attiny12", FamilyAVR1, ELFArchAVR1>; @@ -299,6 +300,8 @@ def : Device<"at90usb82", FamilyAVR35, ELFArchAVR35>; def : Device<"at90usb162", FamilyAVR35, ELFArchAVR35>; def : Device<"ata5505", FamilyAVR35, ELFArchAVR35>; +def : Device<"ata6617c", FamilyAVR35, ELFArchAVR35>; +def : Device<"ata664251", FamilyAVR35, ELFArchAVR35>; def : Device<"atmega8u2", FamilyAVR35, ELFArchAVR35>; def : Device<"atmega16u2", FamilyAVR35, ELFArchAVR35>; def : Device<"atmega32u2", FamilyAVR35, ELFArchAVR35>; @@ -310,6 +313,7 @@ [FeatureMultiplication, FeatureMOVW, FeatureLPMX, FeatureSPM]>; def : Device<"ata6285", FamilyAVR4, ELFArchAVR4>; def : Device<"ata6286", FamilyAVR4, ELFArchAVR4>; +def : Device<"ata6612c", FamilyAVR4, ELFArchAVR4>; def : Device<"atmega48", FamilyAVR4, ELFArchAVR4>; def : Device<"atmega48a", FamilyAVR4, ELFArchAVR4>; def : Device<"atmega48pa", FamilyAVR4, ELFArchAVR4>; @@ -331,8 +335,17 @@ def : Device<"at90pwm3", FamilyAVR4, ELFArchAVR4>; def : Device<"at90pwm3b", FamilyAVR4, ELFArchAVR4>; def : Device<"at90pwm81", FamilyAVR4, ELFArchAVR4>; +def : Device<"ata5702m322", FamilyAVR5, ELFArchAVR5>; +def : Device<"ata5782", FamilyAVR5, ELFArchAVR5>; def : Device<"ata5790", FamilyAVR5, ELFArchAVR5>; +def : Device<"ata5790n", FamilyAVR5, ELFArchAVR5>; +def : Device<"ata5791", FamilyAVR5, ELFArchAVR5>; def : Device<"ata5795", FamilyAVR5, ELFArchAVR5>; +def : Device<"ata5831", FamilyAVR5, ELFArchAVR5>; +def : Device<"ata6613c", FamilyAVR5, ELFArchAVR5>; +def : Device<"ata6614q", FamilyAVR5, ELFArchAVR5>; +def : Device<"ata8210", FamilyAVR5, ELFArchAVR5>; +def : Device<"ata8510", FamilyAVR5, ELFArchAVR5>; def : Device<"atmega16", FamilyAVR5, ELFArchAVR5>; def : Device<"atmega16a", FamilyAVR5, ELFArchAVR5>; def : Device<"atmega161", FamilyAVR3, ELFArchAVR5, @@ -411,6 +424,7 @@ def : Device<"atmega32hvb", FamilyAVR5, ELFArchAVR5>; def : Device<"atmega32hvbrevb", FamilyAVR5, ELFArchAVR5>; def : Device<"atmega64hve", FamilyAVR5, ELFArchAVR5>; +def : Device<"atmega64hve2", FamilyAVR5, ELFArchAVR5>; def : Device<"at90can32", FamilyAVR5, ELFArchAVR5>; def : Device<"at90can64", FamilyAVR5, ELFArchAVR5>; def : Device<"at90pwm161", FamilyAVR5, ELFArchAVR5>; @@ -452,7 +466,9 @@ def : Device<"atxmega16d4", FamilyXMEGA, ELFArchXMEGA2>; def : Device<"atxmega32a4", FamilyXMEGA, ELFArchXMEGA2>; def : Device<"atxmega32a4u", FamilyXMEGAU, ELFArchXMEGA2>; +def : Device<"atxmega32c3", FamilyXMEGAU, ELFArchXMEGA2>; def : Device<"atxmega32c4", FamilyXMEGAU, ELFArchXMEGA2>; +def : Device<"atxmega32d3", FamilyXMEGA, ELFArchXMEGA2>; def : Device<"atxmega32d4", FamilyXMEGA, ELFArchXMEGA2>; def : Device<"atxmega32e5", FamilyXMEGAU, ELFArchXMEGA2>; def : Device<"atxmega16e5", FamilyXMEGAU, ELFArchXMEGA2>;