public inbox for gcc-patches@gcc.gnu.org
 help / color / mirror / Atom feed
* [Patch, avr] Add atmel ata5782 and ata5831 devices
@ 2014-07-11  8:51 S, Pitchumani
  2014-07-11 16:22 ` Denis Chertykov
  0 siblings, 1 reply; 4+ messages in thread
From: S, Pitchumani @ 2014-07-11  8:51 UTC (permalink / raw)
  To: gcc-patches; +Cc: Georg-Johann Lay, Denis Chertykov

[-- Attachment #1: Type: text/plain, Size: 1305 bytes --]

This patch adds supports for Atmel's ata5782 and ata5831 devices.

These devices ISA matches with AVR5 architecture except that text section 
start for these two devices is 0x8000. By default 0x0 is used as the text 
start address. This patch adds a device attribute for text start and that 
is passed to Linker via -Ttext option.

If OK, could someone commit please?

Regards,
Pitchumani

2014-07-11  Pitchumani Sivanupandi  <pitchumani.s@atmel.com>

    * config/avr/avr-arch.h (avr_mcu_t): Add text section start attribute.
    * config/avr/avr-devices.c (AVR_MCU): Same.
    (avr_mcu_types): add text start value to end of device list.
    * config/avr/avr-mcus.def: Add text section start for all devices.
    (ata5782): Add new avr5 device.
    (ata5831): Same.
    * config/avr/avr-tables.opt: Regenerate.
    * config/avr/avr.h: Add declaration for text section start handler.
    (EXTRA_SPEC_FUNCTIONS): Add text section start handler to SPEC functions.
    (LINK_SPEC): Include text section start handler to linker spec.
    * config/avr/driver-avr.c (avr_device_to_text_start): New function to
    pass -Ttext option to linker if the text section start for the device is
    not zero.
    * config/avr/t-multilib: Regenerate.
    * doc/avr-mmcu.texi: Regenerate.


[-- Attachment #2: avr-gcc-ata5782-5831.patch --]
[-- Type: application/octet-stream, Size: 84239 bytes --]

diff --git a/gcc/config/avr/avr-arch.h b/gcc/config/avr/avr-arch.h
index b3c7cc0..34484ff 100644
--- a/gcc/config/avr/avr-arch.h
+++ b/gcc/config/avr/avr-arch.h
@@ -109,6 +109,9 @@ typedef struct
   /* Start of data section.  */
   int data_section_start;
 
+  /* Start of text section. */
+  int text_section_start;
+
   /* Number of 64k segments in the flash.  */
   int n_flash;
 
diff --git a/gcc/config/avr/avr-devices.c b/gcc/config/avr/avr-devices.c
index 2485cad..9044d71 100644
--- a/gcc/config/avr/avr-devices.c
+++ b/gcc/config/avr/avr-devices.c
@@ -104,11 +104,11 @@ avr_texinfo[] =
 const avr_mcu_t
 avr_mcu_types[] =
 {
-#define AVR_MCU(NAME, ARCH, DEV_ATTRIBUTE, MACRO, DATA_SEC, N_FLASH, LIBNAME)\
-  { NAME, ARCH, DEV_ATTRIBUTE, MACRO, DATA_SEC, N_FLASH, LIBNAME },
+#define AVR_MCU(NAME, ARCH, DEV_ATTRIBUTE, MACRO, DATA_SEC, TEXT_SEC, N_FLASH, LIBNAME)\
+  { NAME, ARCH, DEV_ATTRIBUTE, MACRO, DATA_SEC, TEXT_SEC, N_FLASH, LIBNAME },
 #include "avr-mcus.def"
 #undef AVR_MCU
     /* End of list.  */
-  { NULL, ARCH_UNKNOWN, AVR_ISA_NONE, NULL, 0, 0, NULL }
+  { NULL, ARCH_UNKNOWN, AVR_ISA_NONE, NULL, 0, 0, 0, NULL }
 };
 
diff --git a/gcc/config/avr/avr-mcus.def b/gcc/config/avr/avr-mcus.def
index 2c56a63..0a6d7c8 100644
--- a/gcc/config/avr/avr-mcus.def
+++ b/gcc/config/avr/avr-mcus.def
@@ -49,6 +49,8 @@
 
        DATA_SEC      First address of SRAM, used in  -Tdata=  by the driver.
 
+       TEXT_SEC      First address of Flash, used in -Ttext= by the driver.
+
        N_FLASH       Number of 64 KiB flash segments, rounded up.
 
        LIBRARY_NAME  Used by the driver to linke startup code from avr-libc
@@ -57,273 +59,275 @@
    "avr2" must be first for the "0" default to work as intended.  */
 
 /* Classic, <= 8K.  */
-AVR_MCU ("avr2",                 ARCH_AVR2, AVR_ERRATA_SKIP, NULL,                     0x0060, 6, "s8515")
-AVR_MCU ("at90s2313",            ARCH_AVR2, AVR_SHORT_SP, "__AVR_AT90S2313__",         0x0060, 1, "s2313")
-AVR_MCU ("at90s2323",            ARCH_AVR2, AVR_SHORT_SP, "__AVR_AT90S2323__",         0x0060, 1, "s2323")
-AVR_MCU ("at90s2333",            ARCH_AVR2, AVR_SHORT_SP, "__AVR_AT90S2333__",         0x0060, 1, "s2333")
-AVR_MCU ("at90s2343",            ARCH_AVR2, AVR_SHORT_SP, "__AVR_AT90S2343__",         0x0060, 1, "s2343")
-AVR_MCU ("attiny22",             ARCH_AVR2, AVR_SHORT_SP, "__AVR_ATtiny22__",          0x0060, 1, "tn22")
-AVR_MCU ("attiny26",             ARCH_AVR2, AVR_SHORT_SP, "__AVR_ATtiny26__",          0x0060, 1, "tn26")
-AVR_MCU ("at90s4414",            ARCH_AVR2, AVR_ISA_NONE, "__AVR_AT90S4414__",         0x0060, 1, "s4414")
-AVR_MCU ("at90s4433",            ARCH_AVR2, AVR_SHORT_SP, "__AVR_AT90S4433__",         0x0060, 1, "s4433")
-AVR_MCU ("at90s4434",            ARCH_AVR2, AVR_ISA_NONE, "__AVR_AT90S4434__",         0x0060, 1, "s4434")
-AVR_MCU ("at90s8515",            ARCH_AVR2, AVR_ERRATA_SKIP, "__AVR_AT90S8515__",      0x0060, 1, "s8515")
-AVR_MCU ("at90c8534",            ARCH_AVR2, AVR_ISA_NONE, "__AVR_AT90C8534__",         0x0060, 1, "c8534")
-AVR_MCU ("at90s8535",            ARCH_AVR2, AVR_ISA_NONE, "__AVR_AT90S8535__",         0x0060, 1, "s8535")
+AVR_MCU ("avr2",                 ARCH_AVR2, AVR_ERRATA_SKIP, NULL,                     0x0060, 0x0, 6, "s8515")
+AVR_MCU ("at90s2313",            ARCH_AVR2, AVR_SHORT_SP, "__AVR_AT90S2313__",         0x0060, 0x0, 1, "s2313")
+AVR_MCU ("at90s2323",            ARCH_AVR2, AVR_SHORT_SP, "__AVR_AT90S2323__",         0x0060, 0x0, 1, "s2323")
+AVR_MCU ("at90s2333",            ARCH_AVR2, AVR_SHORT_SP, "__AVR_AT90S2333__",         0x0060, 0x0, 1, "s2333")
+AVR_MCU ("at90s2343",            ARCH_AVR2, AVR_SHORT_SP, "__AVR_AT90S2343__",         0x0060, 0x0, 1, "s2343")
+AVR_MCU ("attiny22",             ARCH_AVR2, AVR_SHORT_SP, "__AVR_ATtiny22__",          0x0060, 0x0, 1, "tn22")
+AVR_MCU ("attiny26",             ARCH_AVR2, AVR_SHORT_SP, "__AVR_ATtiny26__",          0x0060, 0x0, 1, "tn26")
+AVR_MCU ("at90s4414",            ARCH_AVR2, AVR_ISA_NONE, "__AVR_AT90S4414__",         0x0060, 0x0, 1, "s4414")
+AVR_MCU ("at90s4433",            ARCH_AVR2, AVR_SHORT_SP, "__AVR_AT90S4433__",         0x0060, 0x0, 1, "s4433")
+AVR_MCU ("at90s4434",            ARCH_AVR2, AVR_ISA_NONE, "__AVR_AT90S4434__",         0x0060, 0x0, 1, "s4434")
+AVR_MCU ("at90s8515",            ARCH_AVR2, AVR_ERRATA_SKIP, "__AVR_AT90S8515__",      0x0060, 0x0, 1, "s8515")
+AVR_MCU ("at90c8534",            ARCH_AVR2, AVR_ISA_NONE, "__AVR_AT90C8534__",         0x0060, 0x0, 1, "c8534")
+AVR_MCU ("at90s8535",            ARCH_AVR2, AVR_ISA_NONE, "__AVR_AT90S8535__",         0x0060, 0x0, 1, "s8535")
 /* Classic + MOVW, <= 8K.  */
-AVR_MCU ("avr25",                ARCH_AVR25, AVR_ISA_NONE, NULL,                       0x0060, 1, "tn85")
-AVR_MCU ("ata5272",              ARCH_AVR25, AVR_ISA_NONE, "__AVR_ATA5272__",          0x0100, 1, "a5272")
-AVR_MCU ("ata6616c",             ARCH_AVR25, AVR_ISA_NONE, "__AVR_ATA6616C__",         0x0100, 1, "a6616c")
-AVR_MCU ("attiny13",             ARCH_AVR25, AVR_SHORT_SP, "__AVR_ATtiny13__",         0x0060, 1, "tn13")
-AVR_MCU ("attiny13a",            ARCH_AVR25, AVR_SHORT_SP, "__AVR_ATtiny13A__",        0x0060, 1, "tn13a")
-AVR_MCU ("attiny2313",           ARCH_AVR25, AVR_SHORT_SP, "__AVR_ATtiny2313__",       0x0060, 1, "tn2313")
-AVR_MCU ("attiny2313a",          ARCH_AVR25, AVR_SHORT_SP, "__AVR_ATtiny2313A__",      0x0060, 1, "tn2313a")
-AVR_MCU ("attiny24",             ARCH_AVR25, AVR_SHORT_SP, "__AVR_ATtiny24__",         0x0060, 1, "tn24")
-AVR_MCU ("attiny24a",            ARCH_AVR25, AVR_SHORT_SP, "__AVR_ATtiny24A__",        0x0060, 1, "tn24a")
-AVR_MCU ("attiny4313",           ARCH_AVR25, AVR_ISA_NONE, "__AVR_ATtiny4313__",       0x0060, 1, "tn4313")
-AVR_MCU ("attiny44",             ARCH_AVR25, AVR_ISA_NONE, "__AVR_ATtiny44__",         0x0060, 1, "tn44")
-AVR_MCU ("attiny44a",            ARCH_AVR25, AVR_ISA_NONE, "__AVR_ATtiny44A__",        0x0060, 1, "tn44a")
-AVR_MCU ("attiny441",            ARCH_AVR25, AVR_ISA_NONE, "__AVR_ATtiny441__",        0x0100, 1, "tn441")
-AVR_MCU ("attiny84",             ARCH_AVR25, AVR_ISA_NONE, "__AVR_ATtiny84__",         0x0060, 1, "tn84")
-AVR_MCU ("attiny84a",            ARCH_AVR25, AVR_ISA_NONE, "__AVR_ATtiny84A__",        0x0060, 1, "tn84")
-AVR_MCU ("attiny25",             ARCH_AVR25, AVR_SHORT_SP, "__AVR_ATtiny25__",         0x0060, 1, "tn25")
-AVR_MCU ("attiny45",             ARCH_AVR25, AVR_ISA_NONE, "__AVR_ATtiny45__",         0x0060, 1, "tn45")
-AVR_MCU ("attiny85",             ARCH_AVR25, AVR_ISA_NONE, "__AVR_ATtiny85__",         0x0060, 1, "tn85")
-AVR_MCU ("attiny261",            ARCH_AVR25, AVR_SHORT_SP, "__AVR_ATtiny261__",        0x0060, 1, "tn261")
-AVR_MCU ("attiny261a",           ARCH_AVR25, AVR_SHORT_SP, "__AVR_ATtiny261A__",       0x0060, 1, "tn261a")
-AVR_MCU ("attiny461",            ARCH_AVR25, AVR_ISA_NONE, "__AVR_ATtiny461__",        0x0060, 1, "tn461")
-AVR_MCU ("attiny461a",           ARCH_AVR25, AVR_ISA_NONE, "__AVR_ATtiny461A__",       0x0060, 1, "tn461a")
-AVR_MCU ("attiny861",            ARCH_AVR25, AVR_ISA_NONE, "__AVR_ATtiny861__",        0x0060, 1, "tn861")
-AVR_MCU ("attiny861a",           ARCH_AVR25, AVR_ISA_NONE, "__AVR_ATtiny861A__",       0x0060, 1, "tn861a")
-AVR_MCU ("attiny43u",            ARCH_AVR25, AVR_ISA_NONE, "__AVR_ATtiny43U__",        0x0060, 1, "tn43u")
-AVR_MCU ("attiny87",             ARCH_AVR25, AVR_ISA_NONE, "__AVR_ATtiny87__",         0x0100, 1, "tn87")
-AVR_MCU ("attiny48",             ARCH_AVR25, AVR_ISA_NONE, "__AVR_ATtiny48__",         0x0100, 1, "tn48")
-AVR_MCU ("attiny88",             ARCH_AVR25, AVR_ISA_NONE, "__AVR_ATtiny88__",         0x0100, 1, "tn88")
-AVR_MCU ("attiny828",            ARCH_AVR25, AVR_ISA_NONE, "__AVR_ATtiny828__",        0x0100, 1, "tn828")
-AVR_MCU ("attiny841",            ARCH_AVR25, AVR_ISA_NONE, "__AVR_ATtiny841__",        0x0100, 1, "tn841")
-AVR_MCU ("at86rf401",            ARCH_AVR25, AVR_ISA_NONE, "__AVR_AT86RF401__",        0x0060, 1, "86401")
+AVR_MCU ("avr25",                ARCH_AVR25, AVR_ISA_NONE, NULL,                       0x0060, 0x0, 1, "tn85")
+AVR_MCU ("ata5272",              ARCH_AVR25, AVR_ISA_NONE, "__AVR_ATA5272__",          0x0100, 0x0, 1, "a5272")
+AVR_MCU ("ata6616c",             ARCH_AVR25, AVR_ISA_NONE, "__AVR_ATA6616C__",         0x0100, 0x0, 1, "a6616c")
+AVR_MCU ("attiny13",             ARCH_AVR25, AVR_SHORT_SP, "__AVR_ATtiny13__",         0x0060, 0x0, 1, "tn13")
+AVR_MCU ("attiny13a",            ARCH_AVR25, AVR_SHORT_SP, "__AVR_ATtiny13A__",        0x0060, 0x0, 1, "tn13a")
+AVR_MCU ("attiny2313",           ARCH_AVR25, AVR_SHORT_SP, "__AVR_ATtiny2313__",       0x0060, 0x0, 1, "tn2313")
+AVR_MCU ("attiny2313a",          ARCH_AVR25, AVR_SHORT_SP, "__AVR_ATtiny2313A__",      0x0060, 0x0, 1, "tn2313a")
+AVR_MCU ("attiny24",             ARCH_AVR25, AVR_SHORT_SP, "__AVR_ATtiny24__",         0x0060, 0x0, 1, "tn24")
+AVR_MCU ("attiny24a",            ARCH_AVR25, AVR_SHORT_SP, "__AVR_ATtiny24A__",        0x0060, 0x0, 1, "tn24a")
+AVR_MCU ("attiny4313",           ARCH_AVR25, AVR_ISA_NONE, "__AVR_ATtiny4313__",       0x0060, 0x0, 1, "tn4313")
+AVR_MCU ("attiny44",             ARCH_AVR25, AVR_ISA_NONE, "__AVR_ATtiny44__",         0x0060, 0x0, 1, "tn44")
+AVR_MCU ("attiny44a",            ARCH_AVR25, AVR_ISA_NONE, "__AVR_ATtiny44A__",        0x0060, 0x0, 1, "tn44a")
+AVR_MCU ("attiny441",            ARCH_AVR25, AVR_ISA_NONE, "__AVR_ATtiny441__",        0x0100, 0x0, 1, "tn441")
+AVR_MCU ("attiny84",             ARCH_AVR25, AVR_ISA_NONE, "__AVR_ATtiny84__",         0x0060, 0x0, 1, "tn84")
+AVR_MCU ("attiny84a",            ARCH_AVR25, AVR_ISA_NONE, "__AVR_ATtiny84A__",        0x0060, 0x0, 1, "tn84")
+AVR_MCU ("attiny25",             ARCH_AVR25, AVR_SHORT_SP, "__AVR_ATtiny25__",         0x0060, 0x0, 1, "tn25")
+AVR_MCU ("attiny45",             ARCH_AVR25, AVR_ISA_NONE, "__AVR_ATtiny45__",         0x0060, 0x0, 1, "tn45")
+AVR_MCU ("attiny85",             ARCH_AVR25, AVR_ISA_NONE, "__AVR_ATtiny85__",         0x0060, 0x0, 1, "tn85")
+AVR_MCU ("attiny261",            ARCH_AVR25, AVR_SHORT_SP, "__AVR_ATtiny261__",        0x0060, 0x0, 1, "tn261")
+AVR_MCU ("attiny261a",           ARCH_AVR25, AVR_SHORT_SP, "__AVR_ATtiny261A__",       0x0060, 0x0, 1, "tn261a")
+AVR_MCU ("attiny461",            ARCH_AVR25, AVR_ISA_NONE, "__AVR_ATtiny461__",        0x0060, 0x0, 1, "tn461")
+AVR_MCU ("attiny461a",           ARCH_AVR25, AVR_ISA_NONE, "__AVR_ATtiny461A__",       0x0060, 0x0, 1, "tn461a")
+AVR_MCU ("attiny861",            ARCH_AVR25, AVR_ISA_NONE, "__AVR_ATtiny861__",        0x0060, 0x0, 1, "tn861")
+AVR_MCU ("attiny861a",           ARCH_AVR25, AVR_ISA_NONE, "__AVR_ATtiny861A__",       0x0060, 0x0, 1, "tn861a")
+AVR_MCU ("attiny43u",            ARCH_AVR25, AVR_ISA_NONE, "__AVR_ATtiny43U__",        0x0060, 0x0, 1, "tn43u")
+AVR_MCU ("attiny87",             ARCH_AVR25, AVR_ISA_NONE, "__AVR_ATtiny87__",         0x0100, 0x0, 1, "tn87")
+AVR_MCU ("attiny48",             ARCH_AVR25, AVR_ISA_NONE, "__AVR_ATtiny48__",         0x0100, 0x0, 1, "tn48")
+AVR_MCU ("attiny88",             ARCH_AVR25, AVR_ISA_NONE, "__AVR_ATtiny88__",         0x0100, 0x0, 1, "tn88")
+AVR_MCU ("attiny828",            ARCH_AVR25, AVR_ISA_NONE, "__AVR_ATtiny828__",        0x0100, 0x0, 1, "tn828")
+AVR_MCU ("attiny841",            ARCH_AVR25, AVR_ISA_NONE, "__AVR_ATtiny841__",        0x0100, 0x0, 1, "tn841")
+AVR_MCU ("at86rf401",            ARCH_AVR25, AVR_ISA_NONE, "__AVR_AT86RF401__",        0x0060, 0x0, 1, "86401")
 /* Classic, > 8K, <= 64K.  */
-AVR_MCU ("avr3",                 ARCH_AVR3, AVR_ISA_NONE, NULL,                        0x0060, 1, "43355")
-AVR_MCU ("at43usb355",           ARCH_AVR3, AVR_ISA_NONE, "__AVR_AT43USB355__",        0x0060, 1, "43355")
-AVR_MCU ("at76c711",             ARCH_AVR3, AVR_ISA_NONE, "__AVR_AT76C711__",          0x0060, 1, "76711")
+AVR_MCU ("avr3",                 ARCH_AVR3, AVR_ISA_NONE, NULL,                        0x0060, 0x0, 1, "43355")
+AVR_MCU ("at43usb355",           ARCH_AVR3, AVR_ISA_NONE, "__AVR_AT43USB355__",        0x0060, 0x0, 1, "43355")
+AVR_MCU ("at76c711",             ARCH_AVR3, AVR_ISA_NONE, "__AVR_AT76C711__",          0x0060, 0x0, 1, "76711")
 /* Classic, == 128K.  */
-AVR_MCU ("avr31",                ARCH_AVR31, AVR_ERRATA_SKIP, NULL,                    0x0060, 2, "m103")
-AVR_MCU ("atmega103",            ARCH_AVR31, AVR_ERRATA_SKIP, "__AVR_ATmega103__",     0x0060, 2, "m103")
-AVR_MCU ("at43usb320",           ARCH_AVR31, AVR_ISA_NONE, "__AVR_AT43USB320__",       0x0060, 2, "43320")
+AVR_MCU ("avr31",                ARCH_AVR31, AVR_ERRATA_SKIP, NULL,                    0x0060, 0x0, 2, "m103")
+AVR_MCU ("atmega103",            ARCH_AVR31, AVR_ERRATA_SKIP, "__AVR_ATmega103__",     0x0060, 0x0, 2, "m103")
+AVR_MCU ("at43usb320",           ARCH_AVR31, AVR_ISA_NONE, "__AVR_AT43USB320__",       0x0060, 0x0, 2, "43320")
 /* Classic + MOVW + JMP/CALL.  */
-AVR_MCU ("avr35",                ARCH_AVR35, AVR_ISA_NONE, NULL,                       0x0100, 1, "usb162")
-AVR_MCU ("ata5505",              ARCH_AVR35, AVR_ISA_NONE, "__AVR_ATA5505__",          0x0100, 1, "a5505")
-AVR_MCU ("ata6617c",             ARCH_AVR35, AVR_ISA_NONE, "__AVR_ATA6617C__",         0x0100, 1, "a6617c")
-AVR_MCU ("ata664251",            ARCH_AVR35, AVR_ISA_NONE, "__AVR_ATA664251__",        0x0100, 1, "a664251")
-AVR_MCU ("at90usb82",            ARCH_AVR35, AVR_ISA_NONE, "__AVR_AT90USB82__",        0x0100, 1, "usb82")
-AVR_MCU ("at90usb162",           ARCH_AVR35, AVR_ISA_NONE, "__AVR_AT90USB162__",       0x0100, 1, "usb162")
-AVR_MCU ("atmega8u2",            ARCH_AVR35, AVR_ISA_NONE, "__AVR_ATmega8U2__",        0x0100, 1, "m8u2")
-AVR_MCU ("atmega16u2",           ARCH_AVR35, AVR_ISA_NONE, "__AVR_ATmega16U2__",       0x0100, 1, "m16u2")
-AVR_MCU ("atmega32u2",           ARCH_AVR35, AVR_ISA_NONE, "__AVR_ATmega32U2__",       0x0100, 1, "m32u2")
-AVR_MCU ("attiny167",            ARCH_AVR35, AVR_ISA_NONE, "__AVR_ATtiny167__",        0x0100, 1, "tn167")
-AVR_MCU ("attiny1634",           ARCH_AVR35, AVR_ISA_NONE, "__AVR_ATtiny1634__",       0x0100, 1, "tn1634")
+AVR_MCU ("avr35",                ARCH_AVR35, AVR_ISA_NONE, NULL,                       0x0100, 0x0, 1, "usb162")
+AVR_MCU ("ata5505",              ARCH_AVR35, AVR_ISA_NONE, "__AVR_ATA5505__",          0x0100, 0x0, 1, "a5505")
+AVR_MCU ("ata6617c",             ARCH_AVR35, AVR_ISA_NONE, "__AVR_ATA6617C__",         0x0100, 0x0, 1, "a6617c")
+AVR_MCU ("ata664251",            ARCH_AVR35, AVR_ISA_NONE, "__AVR_ATA664251__",        0x0100, 0x0, 1, "a664251")
+AVR_MCU ("at90usb82",            ARCH_AVR35, AVR_ISA_NONE, "__AVR_AT90USB82__",        0x0100, 0x0, 1, "usb82")
+AVR_MCU ("at90usb162",           ARCH_AVR35, AVR_ISA_NONE, "__AVR_AT90USB162__",       0x0100, 0x0, 1, "usb162")
+AVR_MCU ("atmega8u2",            ARCH_AVR35, AVR_ISA_NONE, "__AVR_ATmega8U2__",        0x0100, 0x0, 1, "m8u2")
+AVR_MCU ("atmega16u2",           ARCH_AVR35, AVR_ISA_NONE, "__AVR_ATmega16U2__",       0x0100, 0x0, 1, "m16u2")
+AVR_MCU ("atmega32u2",           ARCH_AVR35, AVR_ISA_NONE, "__AVR_ATmega32U2__",       0x0100, 0x0, 1, "m32u2")
+AVR_MCU ("attiny167",            ARCH_AVR35, AVR_ISA_NONE, "__AVR_ATtiny167__",        0x0100, 0x0, 1, "tn167")
+AVR_MCU ("attiny1634",           ARCH_AVR35, AVR_ISA_NONE, "__AVR_ATtiny1634__",       0x0100, 0x0, 1, "tn1634")
 /* Enhanced, <= 8K.  */
-AVR_MCU ("avr4",                 ARCH_AVR4, AVR_ISA_NONE,  NULL,                       0x0060, 1, "m8")
-AVR_MCU ("ata6285",              ARCH_AVR4, AVR_ISA_NONE,  "__AVR_ATA6285__",          0x0100, 1, "a6285")
-AVR_MCU ("ata6286",              ARCH_AVR4, AVR_ISA_NONE,  "__AVR_ATA6286__",          0x0100, 1, "a6286")
-AVR_MCU ("ata6289",              ARCH_AVR4, AVR_ISA_NONE, "__AVR_ATA6289__",           0x0100, 1, "a6289")
-AVR_MCU ("ata6612c",             ARCH_AVR4, AVR_ISA_NONE,  "__AVR_ATA6612C__",         0x0100, 1, "a6612c")
-AVR_MCU ("atmega8",              ARCH_AVR4, AVR_ISA_NONE,  "__AVR_ATmega8__",          0x0060, 1, "m8")
-AVR_MCU ("atmega8a",             ARCH_AVR4, AVR_ISA_NONE,  "__AVR_ATmega8A__",         0x0060, 1, "m8a")
-AVR_MCU ("atmega48",             ARCH_AVR4, AVR_ISA_NONE,  "__AVR_ATmega48__",         0x0100, 1, "m48")
-AVR_MCU ("atmega48a",            ARCH_AVR4, AVR_ISA_NONE,  "__AVR_ATmega48A__",        0x0100, 1, "m48a")
-AVR_MCU ("atmega48p",            ARCH_AVR4, AVR_ISA_NONE,  "__AVR_ATmega48P__",        0x0100, 1, "m48p")
-AVR_MCU ("atmega48pa",           ARCH_AVR4, AVR_ISA_NONE,  "__AVR_ATmega48PA__",       0x0100, 1, "m48pa")
-AVR_MCU ("atmega88",             ARCH_AVR4, AVR_ISA_NONE,  "__AVR_ATmega88__",         0x0100, 1, "m88")
-AVR_MCU ("atmega88a",            ARCH_AVR4, AVR_ISA_NONE,  "__AVR_ATmega88A__",        0x0100, 1, "m88a")
-AVR_MCU ("atmega88p",            ARCH_AVR4, AVR_ISA_NONE,  "__AVR_ATmega88P__",        0x0100, 1, "m88p")
-AVR_MCU ("atmega88pa",           ARCH_AVR4, AVR_ISA_NONE,  "__AVR_ATmega88PA__",       0x0100, 1, "m88pa")
-AVR_MCU ("atmega8515",           ARCH_AVR4, AVR_ISA_NONE,  "__AVR_ATmega8515__",       0x0060, 1, "m8515")
-AVR_MCU ("atmega8535",           ARCH_AVR4, AVR_ISA_NONE,  "__AVR_ATmega8535__",       0x0060, 1, "m8535")
-AVR_MCU ("atmega8hva",           ARCH_AVR4, AVR_ISA_NONE,  "__AVR_ATmega8HVA__",       0x0100, 1, "m8hva")
-AVR_MCU ("at90pwm1",             ARCH_AVR4, AVR_ISA_NONE,  "__AVR_AT90PWM1__",         0x0100, 1, "90pwm1")
-AVR_MCU ("at90pwm2",             ARCH_AVR4, AVR_ISA_NONE,  "__AVR_AT90PWM2__",         0x0100, 1, "90pwm2")
-AVR_MCU ("at90pwm2b",            ARCH_AVR4, AVR_ISA_NONE,  "__AVR_AT90PWM2B__",        0x0100, 1, "90pwm2b")
-AVR_MCU ("at90pwm3",             ARCH_AVR4, AVR_ISA_NONE,  "__AVR_AT90PWM3__",         0x0100, 1, "90pwm3")
-AVR_MCU ("at90pwm3b",            ARCH_AVR4, AVR_ISA_NONE,  "__AVR_AT90PWM3B__",        0x0100, 1, "90pwm3b")
-AVR_MCU ("at90pwm81",            ARCH_AVR4, AVR_ISA_NONE,  "__AVR_AT90PWM81__",        0x0100, 1, "90pwm81")
+AVR_MCU ("avr4",                 ARCH_AVR4, AVR_ISA_NONE,  NULL,                       0x0060, 0x0, 1, "m8")
+AVR_MCU ("ata6285",              ARCH_AVR4, AVR_ISA_NONE,  "__AVR_ATA6285__",          0x0100, 0x0, 1, "a6285")
+AVR_MCU ("ata6286",              ARCH_AVR4, AVR_ISA_NONE,  "__AVR_ATA6286__",          0x0100, 0x0, 1, "a6286")
+AVR_MCU ("ata6289",              ARCH_AVR4, AVR_ISA_NONE, "__AVR_ATA6289__",           0x0100, 0x0, 1, "a6289")
+AVR_MCU ("ata6612c",             ARCH_AVR4, AVR_ISA_NONE,  "__AVR_ATA6612C__",         0x0100, 0x0, 1, "a6612c")
+AVR_MCU ("atmega8",              ARCH_AVR4, AVR_ISA_NONE,  "__AVR_ATmega8__",          0x0060, 0x0, 1, "m8")
+AVR_MCU ("atmega8a",             ARCH_AVR4, AVR_ISA_NONE,  "__AVR_ATmega8A__",         0x0060, 0x0, 1, "m8a")
+AVR_MCU ("atmega48",             ARCH_AVR4, AVR_ISA_NONE,  "__AVR_ATmega48__",         0x0100, 0x0, 1, "m48")
+AVR_MCU ("atmega48a",            ARCH_AVR4, AVR_ISA_NONE,  "__AVR_ATmega48A__",        0x0100, 0x0, 1, "m48a")
+AVR_MCU ("atmega48p",            ARCH_AVR4, AVR_ISA_NONE,  "__AVR_ATmega48P__",        0x0100, 0x0, 1, "m48p")
+AVR_MCU ("atmega48pa",           ARCH_AVR4, AVR_ISA_NONE,  "__AVR_ATmega48PA__",       0x0100, 0x0, 1, "m48pa")
+AVR_MCU ("atmega88",             ARCH_AVR4, AVR_ISA_NONE,  "__AVR_ATmega88__",         0x0100, 0x0, 1, "m88")
+AVR_MCU ("atmega88a",            ARCH_AVR4, AVR_ISA_NONE,  "__AVR_ATmega88A__",        0x0100, 0x0, 1, "m88a")
+AVR_MCU ("atmega88p",            ARCH_AVR4, AVR_ISA_NONE,  "__AVR_ATmega88P__",        0x0100, 0x0, 1, "m88p")
+AVR_MCU ("atmega88pa",           ARCH_AVR4, AVR_ISA_NONE,  "__AVR_ATmega88PA__",       0x0100, 0x0, 1, "m88pa")
+AVR_MCU ("atmega8515",           ARCH_AVR4, AVR_ISA_NONE,  "__AVR_ATmega8515__",       0x0060, 0x0, 1, "m8515")
+AVR_MCU ("atmega8535",           ARCH_AVR4, AVR_ISA_NONE,  "__AVR_ATmega8535__",       0x0060, 0x0, 1, "m8535")
+AVR_MCU ("atmega8hva",           ARCH_AVR4, AVR_ISA_NONE,  "__AVR_ATmega8HVA__",       0x0100, 0x0, 1, "m8hva")
+AVR_MCU ("at90pwm1",             ARCH_AVR4, AVR_ISA_NONE,  "__AVR_AT90PWM1__",         0x0100, 0x0, 1, "90pwm1")
+AVR_MCU ("at90pwm2",             ARCH_AVR4, AVR_ISA_NONE,  "__AVR_AT90PWM2__",         0x0100, 0x0, 1, "90pwm2")
+AVR_MCU ("at90pwm2b",            ARCH_AVR4, AVR_ISA_NONE,  "__AVR_AT90PWM2B__",        0x0100, 0x0, 1, "90pwm2b")
+AVR_MCU ("at90pwm3",             ARCH_AVR4, AVR_ISA_NONE,  "__AVR_AT90PWM3__",         0x0100, 0x0, 1, "90pwm3")
+AVR_MCU ("at90pwm3b",            ARCH_AVR4, AVR_ISA_NONE,  "__AVR_AT90PWM3B__",        0x0100, 0x0, 1, "90pwm3b")
+AVR_MCU ("at90pwm81",            ARCH_AVR4, AVR_ISA_NONE,  "__AVR_AT90PWM81__",        0x0100, 0x0, 1, "90pwm81")
 /* Enhanced, > 8K, <= 64K.  */
-AVR_MCU ("avr5",                 ARCH_AVR5, AVR_ISA_NONE, NULL,                        0x0060, 1, "m16")
-AVR_MCU ("ata5790",              ARCH_AVR5, AVR_ISA_NONE, "__AVR_ATA5790__",           0x0100, 1, "a5790")
-AVR_MCU ("ata5790n",             ARCH_AVR5, AVR_ISA_NONE, "__AVR_ATA5790N__",          0x0100, 1, "a5790n")
-AVR_MCU ("ata5795",              ARCH_AVR5, AVR_ISA_NONE, "__AVR_ATA5795__",           0x0100, 1, "a5795")
-AVR_MCU ("ata6613c",             ARCH_AVR5, AVR_ISA_NONE, "__AVR_ATA6613C__",          0x0100, 1, "a6613c")
-AVR_MCU ("ata6614q",             ARCH_AVR5, AVR_ISA_NONE, "__AVR_ATA6614Q__",          0x0100, 1, "a6614q")
-AVR_MCU ("atmega16",             ARCH_AVR5, AVR_ISA_NONE, "__AVR_ATmega16__",          0x0060, 1, "m16")
-AVR_MCU ("atmega16a",            ARCH_AVR5, AVR_ISA_NONE, "__AVR_ATmega16A__",         0x0060, 1, "m16a")
-AVR_MCU ("atmega161",            ARCH_AVR5, AVR_ISA_NONE, "__AVR_ATmega161__",         0x0060, 1, "m161")
-AVR_MCU ("atmega162",            ARCH_AVR5, AVR_ISA_NONE, "__AVR_ATmega162__",         0x0100, 1, "m162")
-AVR_MCU ("atmega163",            ARCH_AVR5, AVR_ISA_NONE, "__AVR_ATmega163__",         0x0060, 1, "m163")
-AVR_MCU ("atmega164a",           ARCH_AVR5, AVR_ISA_NONE, "__AVR_ATmega164A__",        0x0100, 1, "m164a")
-AVR_MCU ("atmega164p",           ARCH_AVR5, AVR_ISA_NONE, "__AVR_ATmega164P__",        0x0100, 1, "m164p")
-AVR_MCU ("atmega164pa",          ARCH_AVR5, AVR_ISA_NONE, "__AVR_ATmega164PA__",       0x0100, 1, "m164pa")
-AVR_MCU ("atmega165",            ARCH_AVR5, AVR_ISA_NONE, "__AVR_ATmega165__",         0x0100, 1, "m165")
-AVR_MCU ("atmega165a",           ARCH_AVR5, AVR_ISA_NONE, "__AVR_ATmega165A__",        0x0100, 1, "m165a")
-AVR_MCU ("atmega165p",           ARCH_AVR5, AVR_ISA_NONE, "__AVR_ATmega165P__",        0x0100, 1, "m165p")
-AVR_MCU ("atmega165pa",          ARCH_AVR5, AVR_ISA_NONE, "__AVR_ATmega165PA__",       0x0100, 1, "m165pa")
-AVR_MCU ("atmega168",            ARCH_AVR5, AVR_ISA_NONE, "__AVR_ATmega168__",         0x0100, 1, "m168")
-AVR_MCU ("atmega168a",           ARCH_AVR5, AVR_ISA_NONE, "__AVR_ATmega168A__",        0x0100, 1, "m168a")
-AVR_MCU ("atmega168p",           ARCH_AVR5, AVR_ISA_NONE, "__AVR_ATmega168P__",        0x0100, 1, "m168p")
-AVR_MCU ("atmega168pa",          ARCH_AVR5, AVR_ISA_NONE, "__AVR_ATmega168PA__",       0x0100, 1, "m168pa")
-AVR_MCU ("atmega169",            ARCH_AVR5, AVR_ISA_NONE, "__AVR_ATmega169__",         0x0100, 1, "m169")
-AVR_MCU ("atmega169a",           ARCH_AVR5, AVR_ISA_NONE, "__AVR_ATmega169A__",        0x0100, 1, "m169a")
-AVR_MCU ("atmega169p",           ARCH_AVR5, AVR_ISA_NONE, "__AVR_ATmega169P__",        0x0100, 1, "m169p")
-AVR_MCU ("atmega169pa",          ARCH_AVR5, AVR_ISA_NONE, "__AVR_ATmega169PA__",       0x0100, 1, "m169pa")
-AVR_MCU ("atmega16hvb",          ARCH_AVR5, AVR_ISA_NONE, "__AVR_ATmega16HVB__",       0x0100, 1, "m16hvb")
-AVR_MCU ("atmega16hvbrevb",      ARCH_AVR5, AVR_ISA_NONE, "__AVR_ATmega16HVBREVB__",   0x0100, 1, "m16hvbrevb")
-AVR_MCU ("atmega16m1",           ARCH_AVR5, AVR_ISA_NONE, "__AVR_ATmega16M1__",        0x0100, 1, "m16m1")
-AVR_MCU ("atmega16u4",           ARCH_AVR5, AVR_ISA_NONE, "__AVR_ATmega16U4__",        0x0100, 1, "m16u4")
-AVR_MCU ("atmega26hvg",          ARCH_AVR5, AVR_ISA_NONE, "__AVR_ATmega26HVG__",       0x0100, 1, "m26hvg")
-AVR_MCU ("atmega32a",            ARCH_AVR5, AVR_ISA_NONE, "__AVR_ATmega32A__",         0x0060, 1, "m32a")
-AVR_MCU ("atmega32",             ARCH_AVR5, AVR_ISA_NONE, "__AVR_ATmega32__",          0x0060, 1, "m32")
-AVR_MCU ("atmega323",            ARCH_AVR5, AVR_ISA_NONE, "__AVR_ATmega323__",         0x0060, 1, "m323")
-AVR_MCU ("atmega324a",           ARCH_AVR5, AVR_ISA_NONE, "__AVR_ATmega324A__",        0x0100, 1, "m324a")
-AVR_MCU ("atmega324p",           ARCH_AVR5, AVR_ISA_NONE, "__AVR_ATmega324P__",        0x0100, 1, "m324p")
-AVR_MCU ("atmega324pa",          ARCH_AVR5, AVR_ISA_NONE, "__AVR_ATmega324PA__",       0x0100, 1, "m324pa")
-AVR_MCU ("atmega325",            ARCH_AVR5, AVR_ISA_NONE, "__AVR_ATmega325__",         0x0100, 1, "m325")
-AVR_MCU ("atmega325a",           ARCH_AVR5, AVR_ISA_NONE, "__AVR_ATmega325A__",        0x0100, 1, "m325a")
-AVR_MCU ("atmega325p",           ARCH_AVR5, AVR_ISA_NONE, "__AVR_ATmega325P__",        0x0100, 1, "m325p")
-AVR_MCU ("atmega3250",           ARCH_AVR5, AVR_ISA_NONE, "__AVR_ATmega3250__",        0x0100, 1, "m3250")
-AVR_MCU ("atmega3250a",          ARCH_AVR5, AVR_ISA_NONE, "__AVR_ATmega3250A__",       0x0100, 1, "m3250a")
-AVR_MCU ("atmega3250p",          ARCH_AVR5, AVR_ISA_NONE, "__AVR_ATmega3250P__",       0x0100, 1, "m3250p")
-AVR_MCU ("atmega3250pa",         ARCH_AVR5, AVR_ISA_NONE, "__AVR_ATmega3250PA__",      0x0100, 1, "m3250pa")
-AVR_MCU ("atmega328",            ARCH_AVR5, AVR_ISA_NONE, "__AVR_ATmega328__",         0x0100, 1, "m328")
-AVR_MCU ("atmega328p",           ARCH_AVR5, AVR_ISA_NONE, "__AVR_ATmega328P__",        0x0100, 1, "m328p")
-AVR_MCU ("atmega329",            ARCH_AVR5, AVR_ISA_NONE, "__AVR_ATmega329__",         0x0100, 1, "m329")
-AVR_MCU ("atmega329a",           ARCH_AVR5, AVR_ISA_NONE, "__AVR_ATmega329A__",        0x0100, 1, "m329a")
-AVR_MCU ("atmega329p",           ARCH_AVR5, AVR_ISA_NONE, "__AVR_ATmega329P__",        0x0100, 1, "m329p")
-AVR_MCU ("atmega329pa",          ARCH_AVR5, AVR_ISA_NONE, "__AVR_ATmega329PA__",       0x0100, 1, "m329pa")
-AVR_MCU ("atmega3290",           ARCH_AVR5, AVR_ISA_NONE, "__AVR_ATmega3290__",        0x0100, 1, "m3290")
-AVR_MCU ("atmega3290a",          ARCH_AVR5, AVR_ISA_NONE, "__AVR_ATmega3290A__",       0x0100, 1, "m3290a")
-AVR_MCU ("atmega3290p",          ARCH_AVR5, AVR_ISA_NONE, "__AVR_ATmega3290P__",       0x0100, 1, "m3290p")
-AVR_MCU ("atmega3290pa",         ARCH_AVR5, AVR_ISA_NONE, "__AVR_ATmega3290PA__",      0x0100, 1, "m3290pa")
-AVR_MCU ("atmega32c1",           ARCH_AVR5, AVR_ISA_NONE, "__AVR_ATmega32C1__",        0x0100, 1, "m32c1")
-AVR_MCU ("atmega32m1",           ARCH_AVR5, AVR_ISA_NONE, "__AVR_ATmega32M1__",        0x0100, 1, "m32m1")
-AVR_MCU ("atmega32u4",           ARCH_AVR5, AVR_ISA_NONE, "__AVR_ATmega32U4__",        0x0100, 1, "m32u4")
-AVR_MCU ("atmega32u6",           ARCH_AVR5, AVR_ISA_NONE, "__AVR_ATmega32U6__",        0x0100, 1, "m32u6")
-AVR_MCU ("atmega406",            ARCH_AVR5, AVR_ISA_NONE, "__AVR_ATmega406__",         0x0100, 1, "m406")
-AVR_MCU ("atmega64",             ARCH_AVR5, AVR_ISA_NONE, "__AVR_ATmega64__",          0x0100, 1, "m64")
-AVR_MCU ("atmega64a",            ARCH_AVR5, AVR_ISA_NONE, "__AVR_ATmega64A__",         0x0100, 1, "m64a")
-AVR_MCU ("atmega640",            ARCH_AVR5, AVR_ISA_NONE, "__AVR_ATmega640__",         0x0200, 1, "m640")
-AVR_MCU ("atmega644",            ARCH_AVR5, AVR_ISA_NONE, "__AVR_ATmega644__",         0x0100, 1, "m644")
-AVR_MCU ("atmega644a",           ARCH_AVR5, AVR_ISA_NONE, "__AVR_ATmega644A__",        0x0100, 1, "m644a")
-AVR_MCU ("atmega644p",           ARCH_AVR5, AVR_ISA_NONE, "__AVR_ATmega644P__",        0x0100, 1, "m644p")
-AVR_MCU ("atmega644pa",          ARCH_AVR5, AVR_ISA_NONE, "__AVR_ATmega644PA__",       0x0100, 1, "m644pa")
-AVR_MCU ("atmega645",            ARCH_AVR5, AVR_ISA_NONE, "__AVR_ATmega645__",         0x0100, 1, "m645")
-AVR_MCU ("atmega645a",           ARCH_AVR5, AVR_ISA_NONE, "__AVR_ATmega645A__",        0x0100, 1, "m645a")
-AVR_MCU ("atmega645p",           ARCH_AVR5, AVR_ISA_NONE, "__AVR_ATmega645P__",        0x0100, 1, "m645p")
-AVR_MCU ("atmega6450",           ARCH_AVR5, AVR_ISA_NONE, "__AVR_ATmega6450__",        0x0100, 1, "m6450")
-AVR_MCU ("atmega6450a",          ARCH_AVR5, AVR_ISA_NONE, "__AVR_ATmega6450A__",       0x0100, 1, "m6450a")
-AVR_MCU ("atmega6450p",          ARCH_AVR5, AVR_ISA_NONE, "__AVR_ATmega6450P__",       0x0100, 1, "m6450p")
-AVR_MCU ("atmega649",            ARCH_AVR5, AVR_ISA_NONE, "__AVR_ATmega649__",         0x0100, 1, "m649")
-AVR_MCU ("atmega649a",           ARCH_AVR5, AVR_ISA_NONE, "__AVR_ATmega649A__",        0x0100, 1, "m649a")
-AVR_MCU ("atmega649p",           ARCH_AVR5, AVR_ISA_NONE, "__AVR_ATmega649P__",        0x0100, 1, "m649p")
-AVR_MCU ("atmega6490",           ARCH_AVR5, AVR_ISA_NONE, "__AVR_ATmega6490__",        0x0100, 1, "m6490")
-AVR_MCU ("atmega16hva",          ARCH_AVR5, AVR_ISA_NONE, "__AVR_ATmega16HVA__",       0x0100, 1, "m16hva")
-AVR_MCU ("atmega16hva2",         ARCH_AVR5, AVR_ISA_NONE, "__AVR_ATmega16HVA2__",      0x0100, 1, "m16hva2")
-AVR_MCU ("atmega32hvb",          ARCH_AVR5, AVR_ISA_NONE, "__AVR_ATmega32HVB__",       0x0100, 1, "m32hvb")
-AVR_MCU ("atmega6490a",          ARCH_AVR5, AVR_ISA_NONE, "__AVR_ATmega6490A__",       0x0100, 1, "m6490a")
-AVR_MCU ("atmega6490p",          ARCH_AVR5, AVR_ISA_NONE, "__AVR_ATmega6490P__",       0x0100, 1, "m6490p")
-AVR_MCU ("atmega64c1",           ARCH_AVR5, AVR_ISA_NONE, "__AVR_ATmega64C1__",        0x0100, 1, "m64c1")
-AVR_MCU ("atmega64m1",           ARCH_AVR5, AVR_ISA_NONE, "__AVR_ATmega64M1__",        0x0100, 1, "m64m1")
-AVR_MCU ("atmega64hve",          ARCH_AVR5, AVR_ISA_NONE, "__AVR_ATmega64HVE__",       0x0100, 1, "m64hve")
-AVR_MCU ("atmega64rfa2",         ARCH_AVR5, AVR_ISA_NONE, "__AVR_ATmega64RFA2__",      0x0200, 1, "m64rfa2")
-AVR_MCU ("atmega64rfr2",         ARCH_AVR5, AVR_ISA_NONE, "__AVR_ATmega64RFR2__",      0x0200, 1, "m64rfr2")
-AVR_MCU ("atmega32hvbrevb",      ARCH_AVR5, AVR_ISA_NONE, "__AVR_ATmega32HVBREVB__",   0x0100, 1, "m32hvbrevb")
-AVR_MCU ("atmega48hvf",          ARCH_AVR5, AVR_ISA_NONE, "__AVR_ATmega48HVF__",       0x0100, 1, "m48hvf")
-AVR_MCU ("at90can32",            ARCH_AVR5, AVR_ISA_NONE, "__AVR_AT90CAN32__",         0x0100, 1, "can32")
-AVR_MCU ("at90can64",            ARCH_AVR5, AVR_ISA_NONE, "__AVR_AT90CAN64__",         0x0100, 1, "can64")
-AVR_MCU ("at90pwm161",           ARCH_AVR5, AVR_ISA_NONE, "__AVR_AT90PWM161__",        0x0100, 1, "90pwm161")
-AVR_MCU ("at90pwm216",           ARCH_AVR5, AVR_ISA_NONE, "__AVR_AT90PWM216__",        0x0100, 1, "90pwm216")
-AVR_MCU ("at90pwm316",           ARCH_AVR5, AVR_ISA_NONE, "__AVR_AT90PWM316__",        0x0100, 1, "90pwm316")
-AVR_MCU ("at90scr100",           ARCH_AVR5, AVR_ISA_NONE, "__AVR_AT90SCR100__",        0x0100, 1, "90scr100")
-AVR_MCU ("at90usb646",           ARCH_AVR5, AVR_ISA_NONE, "__AVR_AT90USB646__",        0x0100, 1, "usb646")
-AVR_MCU ("at90usb647",           ARCH_AVR5, AVR_ISA_NONE, "__AVR_AT90USB647__",        0x0100, 1, "usb647")
-AVR_MCU ("at94k",                ARCH_AVR5, AVR_ISA_NONE, "__AVR_AT94K__",             0x0060, 1, "at94k")
-AVR_MCU ("m3000",                ARCH_AVR5, AVR_ISA_NONE, "__AVR_M3000__",             0x1000, 1, "m3000")
+AVR_MCU ("avr5",                 ARCH_AVR5, AVR_ISA_NONE, NULL,                        0x0060, 0x0, 1, "m16")
+AVR_MCU ("ata5782",              ARCH_AVR5, AVR_ISA_NONE, "__AVR_ATA5782__",           0x0200, 0x8000, 1, "a5782")
+AVR_MCU ("ata5790",              ARCH_AVR5, AVR_ISA_NONE, "__AVR_ATA5790__",           0x0100, 0x0, 1, "a5790")
+AVR_MCU ("ata5790n",             ARCH_AVR5, AVR_ISA_NONE, "__AVR_ATA5790N__",          0x0100, 0x0, 1, "a5790n")
+AVR_MCU ("ata5795",              ARCH_AVR5, AVR_ISA_NONE, "__AVR_ATA5795__",           0x0100, 0x0, 1, "a5795")
+AVR_MCU ("ata5831",              ARCH_AVR5, AVR_ISA_NONE, "__AVR_ATA5831__",           0x0200, 0x8000, 1, "a5831")
+AVR_MCU ("ata6613c",             ARCH_AVR5, AVR_ISA_NONE, "__AVR_ATA6613C__",          0x0100, 0x0, 1, "a6613c")
+AVR_MCU ("ata6614q",             ARCH_AVR5, AVR_ISA_NONE, "__AVR_ATA6614Q__",          0x0100, 0x0, 1, "a6614q")
+AVR_MCU ("atmega16",             ARCH_AVR5, AVR_ISA_NONE, "__AVR_ATmega16__",          0x0060, 0x0, 1, "m16")
+AVR_MCU ("atmega16a",            ARCH_AVR5, AVR_ISA_NONE, "__AVR_ATmega16A__",         0x0060, 0x0, 1, "m16a")
+AVR_MCU ("atmega161",            ARCH_AVR5, AVR_ISA_NONE, "__AVR_ATmega161__",         0x0060, 0x0, 1, "m161")
+AVR_MCU ("atmega162",            ARCH_AVR5, AVR_ISA_NONE, "__AVR_ATmega162__",         0x0100, 0x0, 1, "m162")
+AVR_MCU ("atmega163",            ARCH_AVR5, AVR_ISA_NONE, "__AVR_ATmega163__",         0x0060, 0x0, 1, "m163")
+AVR_MCU ("atmega164a",           ARCH_AVR5, AVR_ISA_NONE, "__AVR_ATmega164A__",        0x0100, 0x0, 1, "m164a")
+AVR_MCU ("atmega164p",           ARCH_AVR5, AVR_ISA_NONE, "__AVR_ATmega164P__",        0x0100, 0x0, 1, "m164p")
+AVR_MCU ("atmega164pa",          ARCH_AVR5, AVR_ISA_NONE, "__AVR_ATmega164PA__",       0x0100, 0x0, 1, "m164pa")
+AVR_MCU ("atmega165",            ARCH_AVR5, AVR_ISA_NONE, "__AVR_ATmega165__",         0x0100, 0x0, 1, "m165")
+AVR_MCU ("atmega165a",           ARCH_AVR5, AVR_ISA_NONE, "__AVR_ATmega165A__",        0x0100, 0x0, 1, "m165a")
+AVR_MCU ("atmega165p",           ARCH_AVR5, AVR_ISA_NONE, "__AVR_ATmega165P__",        0x0100, 0x0, 1, "m165p")
+AVR_MCU ("atmega165pa",          ARCH_AVR5, AVR_ISA_NONE, "__AVR_ATmega165PA__",       0x0100, 0x0, 1, "m165pa")
+AVR_MCU ("atmega168",            ARCH_AVR5, AVR_ISA_NONE, "__AVR_ATmega168__",         0x0100, 0x0, 1, "m168")
+AVR_MCU ("atmega168a",           ARCH_AVR5, AVR_ISA_NONE, "__AVR_ATmega168A__",        0x0100, 0x0, 1, "m168a")
+AVR_MCU ("atmega168p",           ARCH_AVR5, AVR_ISA_NONE, "__AVR_ATmega168P__",        0x0100, 0x0, 1, "m168p")
+AVR_MCU ("atmega168pa",          ARCH_AVR5, AVR_ISA_NONE, "__AVR_ATmega168PA__",       0x0100, 0x0, 1, "m168pa")
+AVR_MCU ("atmega169",            ARCH_AVR5, AVR_ISA_NONE, "__AVR_ATmega169__",         0x0100, 0x0, 1, "m169")
+AVR_MCU ("atmega169a",           ARCH_AVR5, AVR_ISA_NONE, "__AVR_ATmega169A__",        0x0100, 0x0, 1, "m169a")
+AVR_MCU ("atmega169p",           ARCH_AVR5, AVR_ISA_NONE, "__AVR_ATmega169P__",        0x0100, 0x0, 1, "m169p")
+AVR_MCU ("atmega169pa",          ARCH_AVR5, AVR_ISA_NONE, "__AVR_ATmega169PA__",       0x0100, 0x0, 1, "m169pa")
+AVR_MCU ("atmega16hvb",          ARCH_AVR5, AVR_ISA_NONE, "__AVR_ATmega16HVB__",       0x0100, 0x0, 1, "m16hvb")
+AVR_MCU ("atmega16hvbrevb",      ARCH_AVR5, AVR_ISA_NONE, "__AVR_ATmega16HVBREVB__",   0x0100, 0x0, 1, "m16hvbrevb")
+AVR_MCU ("atmega16m1",           ARCH_AVR5, AVR_ISA_NONE, "__AVR_ATmega16M1__",        0x0100, 0x0, 1, "m16m1")
+AVR_MCU ("atmega16u4",           ARCH_AVR5, AVR_ISA_NONE, "__AVR_ATmega16U4__",        0x0100, 0x0, 1, "m16u4")
+AVR_MCU ("atmega26hvg",          ARCH_AVR5, AVR_ISA_NONE, "__AVR_ATmega26HVG__",       0x0100, 0x0, 1, "m26hvg")
+AVR_MCU ("atmega32a",            ARCH_AVR5, AVR_ISA_NONE, "__AVR_ATmega32A__",         0x0060, 0x0, 1, "m32a")
+AVR_MCU ("atmega32",             ARCH_AVR5, AVR_ISA_NONE, "__AVR_ATmega32__",          0x0060, 0x0, 1, "m32")
+AVR_MCU ("atmega323",            ARCH_AVR5, AVR_ISA_NONE, "__AVR_ATmega323__",         0x0060, 0x0, 1, "m323")
+AVR_MCU ("atmega324a",           ARCH_AVR5, AVR_ISA_NONE, "__AVR_ATmega324A__",        0x0100, 0x0, 1, "m324a")
+AVR_MCU ("atmega324p",           ARCH_AVR5, AVR_ISA_NONE, "__AVR_ATmega324P__",        0x0100, 0x0, 1, "m324p")
+AVR_MCU ("atmega324pa",          ARCH_AVR5, AVR_ISA_NONE, "__AVR_ATmega324PA__",       0x0100, 0x0, 1, "m324pa")
+AVR_MCU ("atmega325",            ARCH_AVR5, AVR_ISA_NONE, "__AVR_ATmega325__",         0x0100, 0x0, 1, "m325")
+AVR_MCU ("atmega325a",           ARCH_AVR5, AVR_ISA_NONE, "__AVR_ATmega325A__",        0x0100, 0x0, 1, "m325a")
+AVR_MCU ("atmega325p",           ARCH_AVR5, AVR_ISA_NONE, "__AVR_ATmega325P__",        0x0100, 0x0, 1, "m325p")
+AVR_MCU ("atmega3250",           ARCH_AVR5, AVR_ISA_NONE, "__AVR_ATmega3250__",        0x0100, 0x0, 1, "m3250")
+AVR_MCU ("atmega3250a",          ARCH_AVR5, AVR_ISA_NONE, "__AVR_ATmega3250A__",       0x0100, 0x0, 1, "m3250a")
+AVR_MCU ("atmega3250p",          ARCH_AVR5, AVR_ISA_NONE, "__AVR_ATmega3250P__",       0x0100, 0x0, 1, "m3250p")
+AVR_MCU ("atmega3250pa",         ARCH_AVR5, AVR_ISA_NONE, "__AVR_ATmega3250PA__",      0x0100, 0x0, 1, "m3250pa")
+AVR_MCU ("atmega328",            ARCH_AVR5, AVR_ISA_NONE, "__AVR_ATmega328__",         0x0100, 0x0, 1, "m328")
+AVR_MCU ("atmega328p",           ARCH_AVR5, AVR_ISA_NONE, "__AVR_ATmega328P__",        0x0100, 0x0, 1, "m328p")
+AVR_MCU ("atmega329",            ARCH_AVR5, AVR_ISA_NONE, "__AVR_ATmega329__",         0x0100, 0x0, 1, "m329")
+AVR_MCU ("atmega329a",           ARCH_AVR5, AVR_ISA_NONE, "__AVR_ATmega329A__",        0x0100, 0x0, 1, "m329a")
+AVR_MCU ("atmega329p",           ARCH_AVR5, AVR_ISA_NONE, "__AVR_ATmega329P__",        0x0100, 0x0, 1, "m329p")
+AVR_MCU ("atmega329pa",          ARCH_AVR5, AVR_ISA_NONE, "__AVR_ATmega329PA__",       0x0100, 0x0, 1, "m329pa")
+AVR_MCU ("atmega3290",           ARCH_AVR5, AVR_ISA_NONE, "__AVR_ATmega3290__",        0x0100, 0x0, 1, "m3290")
+AVR_MCU ("atmega3290a",          ARCH_AVR5, AVR_ISA_NONE, "__AVR_ATmega3290A__",       0x0100, 0x0, 1, "m3290a")
+AVR_MCU ("atmega3290p",          ARCH_AVR5, AVR_ISA_NONE, "__AVR_ATmega3290P__",       0x0100, 0x0, 1, "m3290p")
+AVR_MCU ("atmega3290pa",         ARCH_AVR5, AVR_ISA_NONE, "__AVR_ATmega3290PA__",      0x0100, 0x0, 1, "m3290pa")
+AVR_MCU ("atmega32c1",           ARCH_AVR5, AVR_ISA_NONE, "__AVR_ATmega32C1__",        0x0100, 0x0, 1, "m32c1")
+AVR_MCU ("atmega32m1",           ARCH_AVR5, AVR_ISA_NONE, "__AVR_ATmega32M1__",        0x0100, 0x0, 1, "m32m1")
+AVR_MCU ("atmega32u4",           ARCH_AVR5, AVR_ISA_NONE, "__AVR_ATmega32U4__",        0x0100, 0x0, 1, "m32u4")
+AVR_MCU ("atmega32u6",           ARCH_AVR5, AVR_ISA_NONE, "__AVR_ATmega32U6__",        0x0100, 0x0, 1, "m32u6")
+AVR_MCU ("atmega406",            ARCH_AVR5, AVR_ISA_NONE, "__AVR_ATmega406__",         0x0100, 0x0, 1, "m406")
+AVR_MCU ("atmega64",             ARCH_AVR5, AVR_ISA_NONE, "__AVR_ATmega64__",          0x0100, 0x0, 1, "m64")
+AVR_MCU ("atmega64a",            ARCH_AVR5, AVR_ISA_NONE, "__AVR_ATmega64A__",         0x0100, 0x0, 1, "m64a")
+AVR_MCU ("atmega640",            ARCH_AVR5, AVR_ISA_NONE, "__AVR_ATmega640__",         0x0200, 0x0, 1, "m640")
+AVR_MCU ("atmega644",            ARCH_AVR5, AVR_ISA_NONE, "__AVR_ATmega644__",         0x0100, 0x0, 1, "m644")
+AVR_MCU ("atmega644a",           ARCH_AVR5, AVR_ISA_NONE, "__AVR_ATmega644A__",        0x0100, 0x0, 1, "m644a")
+AVR_MCU ("atmega644p",           ARCH_AVR5, AVR_ISA_NONE, "__AVR_ATmega644P__",        0x0100, 0x0, 1, "m644p")
+AVR_MCU ("atmega644pa",          ARCH_AVR5, AVR_ISA_NONE, "__AVR_ATmega644PA__",       0x0100, 0x0, 1, "m644pa")
+AVR_MCU ("atmega645",            ARCH_AVR5, AVR_ISA_NONE, "__AVR_ATmega645__",         0x0100, 0x0, 1, "m645")
+AVR_MCU ("atmega645a",           ARCH_AVR5, AVR_ISA_NONE, "__AVR_ATmega645A__",        0x0100, 0x0, 1, "m645a")
+AVR_MCU ("atmega645p",           ARCH_AVR5, AVR_ISA_NONE, "__AVR_ATmega645P__",        0x0100, 0x0, 1, "m645p")
+AVR_MCU ("atmega6450",           ARCH_AVR5, AVR_ISA_NONE, "__AVR_ATmega6450__",        0x0100, 0x0, 1, "m6450")
+AVR_MCU ("atmega6450a",          ARCH_AVR5, AVR_ISA_NONE, "__AVR_ATmega6450A__",       0x0100, 0x0, 1, "m6450a")
+AVR_MCU ("atmega6450p",          ARCH_AVR5, AVR_ISA_NONE, "__AVR_ATmega6450P__",       0x0100, 0x0, 1, "m6450p")
+AVR_MCU ("atmega649",            ARCH_AVR5, AVR_ISA_NONE, "__AVR_ATmega649__",         0x0100, 0x0, 1, "m649")
+AVR_MCU ("atmega649a",           ARCH_AVR5, AVR_ISA_NONE, "__AVR_ATmega649A__",        0x0100, 0x0, 1, "m649a")
+AVR_MCU ("atmega649p",           ARCH_AVR5, AVR_ISA_NONE, "__AVR_ATmega649P__",        0x0100, 0x0, 1, "m649p")
+AVR_MCU ("atmega6490",           ARCH_AVR5, AVR_ISA_NONE, "__AVR_ATmega6490__",        0x0100, 0x0, 1, "m6490")
+AVR_MCU ("atmega16hva",          ARCH_AVR5, AVR_ISA_NONE, "__AVR_ATmega16HVA__",       0x0100, 0x0, 1, "m16hva")
+AVR_MCU ("atmega16hva2",         ARCH_AVR5, AVR_ISA_NONE, "__AVR_ATmega16HVA2__",      0x0100, 0x0, 1, "m16hva2")
+AVR_MCU ("atmega32hvb",          ARCH_AVR5, AVR_ISA_NONE, "__AVR_ATmega32HVB__",       0x0100, 0x0, 1, "m32hvb")
+AVR_MCU ("atmega6490a",          ARCH_AVR5, AVR_ISA_NONE, "__AVR_ATmega6490A__",       0x0100, 0x0, 1, "m6490a")
+AVR_MCU ("atmega6490p",          ARCH_AVR5, AVR_ISA_NONE, "__AVR_ATmega6490P__",       0x0100, 0x0, 1, "m6490p")
+AVR_MCU ("atmega64c1",           ARCH_AVR5, AVR_ISA_NONE, "__AVR_ATmega64C1__",        0x0100, 0x0, 1, "m64c1")
+AVR_MCU ("atmega64m1",           ARCH_AVR5, AVR_ISA_NONE, "__AVR_ATmega64M1__",        0x0100, 0x0, 1, "m64m1")
+AVR_MCU ("atmega64hve",          ARCH_AVR5, AVR_ISA_NONE, "__AVR_ATmega64HVE__",       0x0100, 0x0, 1, "m64hve")
+AVR_MCU ("atmega64rfa2",         ARCH_AVR5, AVR_ISA_NONE, "__AVR_ATmega64RFA2__",      0x0200, 0x0, 1, "m64rfa2")
+AVR_MCU ("atmega64rfr2",         ARCH_AVR5, AVR_ISA_NONE, "__AVR_ATmega64RFR2__",      0x0200, 0x0, 1, "m64rfr2")
+AVR_MCU ("atmega32hvbrevb",      ARCH_AVR5, AVR_ISA_NONE, "__AVR_ATmega32HVBREVB__",   0x0100, 0x0, 1, "m32hvbrevb")
+AVR_MCU ("atmega48hvf",          ARCH_AVR5, AVR_ISA_NONE, "__AVR_ATmega48HVF__",       0x0100, 0x0, 1, "m48hvf")
+AVR_MCU ("at90can32",            ARCH_AVR5, AVR_ISA_NONE, "__AVR_AT90CAN32__",         0x0100, 0x0, 1, "can32")
+AVR_MCU ("at90can64",            ARCH_AVR5, AVR_ISA_NONE, "__AVR_AT90CAN64__",         0x0100, 0x0, 1, "can64")
+AVR_MCU ("at90pwm161",           ARCH_AVR5, AVR_ISA_NONE, "__AVR_AT90PWM161__",        0x0100, 0x0, 1, "90pwm161")
+AVR_MCU ("at90pwm216",           ARCH_AVR5, AVR_ISA_NONE, "__AVR_AT90PWM216__",        0x0100, 0x0, 1, "90pwm216")
+AVR_MCU ("at90pwm316",           ARCH_AVR5, AVR_ISA_NONE, "__AVR_AT90PWM316__",        0x0100, 0x0, 1, "90pwm316")
+AVR_MCU ("at90scr100",           ARCH_AVR5, AVR_ISA_NONE, "__AVR_AT90SCR100__",        0x0100, 0x0, 1, "90scr100")
+AVR_MCU ("at90usb646",           ARCH_AVR5, AVR_ISA_NONE, "__AVR_AT90USB646__",        0x0100, 0x0, 1, "usb646")
+AVR_MCU ("at90usb647",           ARCH_AVR5, AVR_ISA_NONE, "__AVR_AT90USB647__",        0x0100, 0x0, 1, "usb647")
+AVR_MCU ("at94k",                ARCH_AVR5, AVR_ISA_NONE, "__AVR_AT94K__",             0x0060, 0x0, 1, "at94k")
+AVR_MCU ("m3000",                ARCH_AVR5, AVR_ISA_NONE, "__AVR_M3000__",             0x1000, 0x0, 1, "m3000")
 /* Enhanced, == 128K.  */
-AVR_MCU ("avr51",                ARCH_AVR51, AVR_ISA_NONE, NULL,                       0x0100, 2, "m128")
-AVR_MCU ("atmega128",            ARCH_AVR51, AVR_ISA_NONE, "__AVR_ATmega128__",        0x0100, 2, "m128")
-AVR_MCU ("atmega128a",           ARCH_AVR51, AVR_ISA_NONE, "__AVR_ATmega128A__",       0x0100, 2, "m128a")
-AVR_MCU ("atmega1280",           ARCH_AVR51, AVR_ISA_NONE, "__AVR_ATmega1280__",       0x0200, 2, "m1280")
-AVR_MCU ("atmega1281",           ARCH_AVR51, AVR_ISA_NONE, "__AVR_ATmega1281__",       0x0200, 2, "m1281")
-AVR_MCU ("atmega1284",           ARCH_AVR51, AVR_ISA_NONE, "__AVR_ATmega1284__",       0x0100, 2, "m1284")
-AVR_MCU ("atmega1284p",          ARCH_AVR51, AVR_ISA_NONE, "__AVR_ATmega1284P__",      0x0100, 2, "m1284p")
-AVR_MCU ("atmega128rfa1",        ARCH_AVR51, AVR_ISA_NONE, "__AVR_ATmega128RFA1__",    0x0200, 2, "m128rfa1")
-AVR_MCU ("at90can128",           ARCH_AVR51, AVR_ISA_NONE, "__AVR_AT90CAN128__",       0x0100, 2, "can128")
-AVR_MCU ("at90usb1286",          ARCH_AVR51, AVR_ISA_NONE, "__AVR_AT90USB1286__",      0x0100, 2, "usb1286")
-AVR_MCU ("at90usb1287",          ARCH_AVR51, AVR_ISA_NONE, "__AVR_AT90USB1287__",      0x0100, 2, "usb1287")
+AVR_MCU ("avr51",                ARCH_AVR51, AVR_ISA_NONE, NULL,                       0x0100, 0x0, 2, "m128")
+AVR_MCU ("atmega128",            ARCH_AVR51, AVR_ISA_NONE, "__AVR_ATmega128__",        0x0100, 0x0, 2, "m128")
+AVR_MCU ("atmega128a",           ARCH_AVR51, AVR_ISA_NONE, "__AVR_ATmega128A__",       0x0100, 0x0, 2, "m128a")
+AVR_MCU ("atmega1280",           ARCH_AVR51, AVR_ISA_NONE, "__AVR_ATmega1280__",       0x0200, 0x0, 2, "m1280")
+AVR_MCU ("atmega1281",           ARCH_AVR51, AVR_ISA_NONE, "__AVR_ATmega1281__",       0x0200, 0x0, 2, "m1281")
+AVR_MCU ("atmega1284",           ARCH_AVR51, AVR_ISA_NONE, "__AVR_ATmega1284__",       0x0100, 0x0, 2, "m1284")
+AVR_MCU ("atmega1284p",          ARCH_AVR51, AVR_ISA_NONE, "__AVR_ATmega1284P__",      0x0100, 0x0, 2, "m1284p")
+AVR_MCU ("atmega128rfa1",        ARCH_AVR51, AVR_ISA_NONE, "__AVR_ATmega128RFA1__",    0x0200, 0x0, 2, "m128rfa1")
+AVR_MCU ("at90can128",           ARCH_AVR51, AVR_ISA_NONE, "__AVR_AT90CAN128__",       0x0100, 0x0, 2, "can128")
+AVR_MCU ("at90usb1286",          ARCH_AVR51, AVR_ISA_NONE, "__AVR_AT90USB1286__",      0x0100, 0x0, 2, "usb1286")
+AVR_MCU ("at90usb1287",          ARCH_AVR51, AVR_ISA_NONE, "__AVR_AT90USB1287__",      0x0100, 0x0, 2, "usb1287")
 /* 3-Byte PC.  */
-AVR_MCU ("avr6",                 ARCH_AVR6, AVR_ISA_NONE, NULL,                        0x0200, 4, "m2561")
-AVR_MCU ("atmega2560",           ARCH_AVR6, AVR_ISA_NONE, "__AVR_ATmega2560__",        0x0200, 4, "m2560")
-AVR_MCU ("atmega2561",           ARCH_AVR6, AVR_ISA_NONE, "__AVR_ATmega2561__",        0x0200, 4, "m2561")
+AVR_MCU ("avr6",                 ARCH_AVR6, AVR_ISA_NONE, NULL,                        0x0200, 0x0, 4, "m2561")
+AVR_MCU ("atmega2560",           ARCH_AVR6, AVR_ISA_NONE, "__AVR_ATmega2560__",        0x0200, 0x0, 4, "m2560")
+AVR_MCU ("atmega2561",           ARCH_AVR6, AVR_ISA_NONE, "__AVR_ATmega2561__",        0x0200, 0x0, 4, "m2561")
 /* Xmega, 16K <= Flash < 64K, RAM <= 64K */
-AVR_MCU ("avrxmega2",        ARCH_AVRXMEGA2, AVR_ISA_NONE, NULL,                       0x2000, 1, "x32a4")
-AVR_MCU ("atxmega16a4",      ARCH_AVRXMEGA2, AVR_ISA_NONE, "__AVR_ATxmega16A4__",      0x2000, 1, "x16a4")
-AVR_MCU ("atxmega16d4",      ARCH_AVRXMEGA2, AVR_ISA_NONE, "__AVR_ATxmega16D4__",      0x2000, 1, "x16d4")
-AVR_MCU ("atxmega32a4",      ARCH_AVRXMEGA2, AVR_ISA_NONE, "__AVR_ATxmega32A4__",      0x2000, 1, "x32a4")
-AVR_MCU ("atxmega32d4",      ARCH_AVRXMEGA2, AVR_ISA_NONE, "__AVR_ATxmega32D4__",      0x2000, 1, "x32d4")
-AVR_MCU ("atxmega32x1",      ARCH_AVRXMEGA2, AVR_ISA_NONE, "__AVR_ATxmega32X1__",      0x2000, 1, "x32x1")
-AVR_MCU ("atmxt112sl",       ARCH_AVRXMEGA2, AVR_ISA_NONE, "__AVR_ATMXT112SL__",       0x2000, 1, "mxt112sl")
-AVR_MCU ("atmxt224",         ARCH_AVRXMEGA2, AVR_ISA_NONE, "__AVR_ATMXT224__",         0x2000, 1, "mxt224")
-AVR_MCU ("atmxt224e",        ARCH_AVRXMEGA2, AVR_ISA_NONE, "__AVR_ATMXT224E__",        0x2000, 1, "mxt224e")
-AVR_MCU ("atmxt336s",        ARCH_AVRXMEGA2, AVR_ISA_NONE, "__AVR_ATMXT336S__",        0x2000, 1, "mxt336s")
-AVR_MCU ("atxmega16a4u",     ARCH_AVRXMEGA2, AVR_ISA_RMW,  "__AVR_ATxmega16A4U__",     0x2000, 1, "x16a4u")
-AVR_MCU ("atxmega16c4",      ARCH_AVRXMEGA2, AVR_ISA_RMW,  "__AVR_ATxmega16C4__",      0x2000, 1, "x16c4")
-AVR_MCU ("atxmega32a4u",     ARCH_AVRXMEGA2, AVR_ISA_RMW,  "__AVR_ATxmega32A4U__",     0x2000, 1, "x32a4u")
-AVR_MCU ("atxmega32c4",      ARCH_AVRXMEGA2, AVR_ISA_RMW,  "__AVR_ATxmega32C4__",      0x2000, 1, "x32c4")
-AVR_MCU ("atxmega32e5",      ARCH_AVRXMEGA2, AVR_ISA_NONE, "__AVR_ATxmega32E5__",      0x2000, 1, "x32e5")
+AVR_MCU ("avrxmega2",        ARCH_AVRXMEGA2, AVR_ISA_NONE, NULL,                       0x2000, 0x0, 1, "x32a4")
+AVR_MCU ("atxmega16a4",      ARCH_AVRXMEGA2, AVR_ISA_NONE, "__AVR_ATxmega16A4__",      0x2000, 0x0, 1, "x16a4")
+AVR_MCU ("atxmega16d4",      ARCH_AVRXMEGA2, AVR_ISA_NONE, "__AVR_ATxmega16D4__",      0x2000, 0x0, 1, "x16d4")
+AVR_MCU ("atxmega32a4",      ARCH_AVRXMEGA2, AVR_ISA_NONE, "__AVR_ATxmega32A4__",      0x2000, 0x0, 1, "x32a4")
+AVR_MCU ("atxmega32d4",      ARCH_AVRXMEGA2, AVR_ISA_NONE, "__AVR_ATxmega32D4__",      0x2000, 0x0, 1, "x32d4")
+AVR_MCU ("atxmega32x1",      ARCH_AVRXMEGA2, AVR_ISA_NONE, "__AVR_ATxmega32X1__",      0x2000, 0x0, 1, "x32x1")
+AVR_MCU ("atmxt112sl",       ARCH_AVRXMEGA2, AVR_ISA_NONE, "__AVR_ATMXT112SL__",       0x2000, 0x0, 1, "mxt112sl")
+AVR_MCU ("atmxt224",         ARCH_AVRXMEGA2, AVR_ISA_NONE, "__AVR_ATMXT224__",         0x2000, 0x0, 1, "mxt224")
+AVR_MCU ("atmxt224e",        ARCH_AVRXMEGA2, AVR_ISA_NONE, "__AVR_ATMXT224E__",        0x2000, 0x0, 1, "mxt224e")
+AVR_MCU ("atmxt336s",        ARCH_AVRXMEGA2, AVR_ISA_NONE, "__AVR_ATMXT336S__",        0x2000, 0x0, 1, "mxt336s")
+AVR_MCU ("atxmega16a4u",     ARCH_AVRXMEGA2, AVR_ISA_RMW,  "__AVR_ATxmega16A4U__",     0x2000, 0x0, 1, "x16a4u")
+AVR_MCU ("atxmega16c4",      ARCH_AVRXMEGA2, AVR_ISA_RMW,  "__AVR_ATxmega16C4__",      0x2000, 0x0, 1, "x16c4")
+AVR_MCU ("atxmega32a4u",     ARCH_AVRXMEGA2, AVR_ISA_RMW,  "__AVR_ATxmega32A4U__",     0x2000, 0x0, 1, "x32a4u")
+AVR_MCU ("atxmega32c4",      ARCH_AVRXMEGA2, AVR_ISA_RMW,  "__AVR_ATxmega32C4__",      0x2000, 0x0, 1, "x32c4")
+AVR_MCU ("atxmega32e5",      ARCH_AVRXMEGA2, AVR_ISA_NONE, "__AVR_ATxmega32E5__",      0x2000, 0x0, 1, "x32e5")
 /* Xmega, 64K < Flash <= 128K, RAM <= 64K */
-AVR_MCU ("avrxmega4",        ARCH_AVRXMEGA4, AVR_ISA_NONE, NULL,                       0x2000, 2, "x64a4")
-AVR_MCU ("atxmega64a3",      ARCH_AVRXMEGA4, AVR_ISA_NONE, "__AVR_ATxmega64A3__",      0x2000, 2, "x64a3")
-AVR_MCU ("atxmega64d3",      ARCH_AVRXMEGA4, AVR_ISA_NONE, "__AVR_ATxmega64D3__",      0x2000, 2, "x64d3")
-AVR_MCU ("atxmega64a3u",     ARCH_AVRXMEGA4, AVR_ISA_RMW,  "__AVR_ATxmega64A3U__",     0x2000, 2, "x64a3u")
-AVR_MCU ("atxmega64a4u",     ARCH_AVRXMEGA4, AVR_ISA_RMW,  "__AVR_ATxmega64A4U__",     0x2000, 2, "x64a4u")
-AVR_MCU ("atxmega64b1",      ARCH_AVRXMEGA4, AVR_ISA_RMW,  "__AVR_ATxmega64B1__",      0x2000, 2, "x64b1")
-AVR_MCU ("atxmega64b3",      ARCH_AVRXMEGA4, AVR_ISA_RMW,  "__AVR_ATxmega64B3__",      0x2000, 2, "x64b3")
-AVR_MCU ("atxmega64c3",      ARCH_AVRXMEGA4, AVR_ISA_RMW,  "__AVR_ATxmega64C3__",      0x2000, 2, "x64c3")
-AVR_MCU ("atxmega64d4",      ARCH_AVRXMEGA4, AVR_ISA_NONE, "__AVR_ATxmega64D4__",      0x2000, 2, "x64d4")
+AVR_MCU ("avrxmega4",        ARCH_AVRXMEGA4, AVR_ISA_NONE, NULL,                       0x2000, 0x0, 2, "x64a4")
+AVR_MCU ("atxmega64a3",      ARCH_AVRXMEGA4, AVR_ISA_NONE, "__AVR_ATxmega64A3__",      0x2000, 0x0, 2, "x64a3")
+AVR_MCU ("atxmega64d3",      ARCH_AVRXMEGA4, AVR_ISA_NONE, "__AVR_ATxmega64D3__",      0x2000, 0x0, 2, "x64d3")
+AVR_MCU ("atxmega64a3u",     ARCH_AVRXMEGA4, AVR_ISA_RMW,  "__AVR_ATxmega64A3U__",     0x2000, 0x0, 2, "x64a3u")
+AVR_MCU ("atxmega64a4u",     ARCH_AVRXMEGA4, AVR_ISA_RMW,  "__AVR_ATxmega64A4U__",     0x2000, 0x0, 2, "x64a4u")
+AVR_MCU ("atxmega64b1",      ARCH_AVRXMEGA4, AVR_ISA_RMW,  "__AVR_ATxmega64B1__",      0x2000, 0x0, 2, "x64b1")
+AVR_MCU ("atxmega64b3",      ARCH_AVRXMEGA4, AVR_ISA_RMW,  "__AVR_ATxmega64B3__",      0x2000, 0x0, 2, "x64b3")
+AVR_MCU ("atxmega64c3",      ARCH_AVRXMEGA4, AVR_ISA_RMW,  "__AVR_ATxmega64C3__",      0x2000, 0x0, 2, "x64c3")
+AVR_MCU ("atxmega64d4",      ARCH_AVRXMEGA4, AVR_ISA_NONE, "__AVR_ATxmega64D4__",      0x2000, 0x0, 2, "x64d4")
 /* Xmega, 64K < Flash <= 128K, RAM > 64K */
-AVR_MCU ("avrxmega5",        ARCH_AVRXMEGA5, AVR_ISA_NONE, NULL,                       0x2000, 2, "x64a1")
-AVR_MCU ("atxmega64a1",      ARCH_AVRXMEGA5, AVR_ISA_NONE, "__AVR_ATxmega64A1__",      0x2000, 2, "x64a1")
-AVR_MCU ("atxmega64a1u",     ARCH_AVRXMEGA5, AVR_ISA_RMW,  "__AVR_ATxmega64A1U__",     0x2000, 2, "x64a1u")
+AVR_MCU ("avrxmega5",        ARCH_AVRXMEGA5, AVR_ISA_NONE, NULL,                       0x2000, 0x0, 2, "x64a1")
+AVR_MCU ("atxmega64a1",      ARCH_AVRXMEGA5, AVR_ISA_NONE, "__AVR_ATxmega64A1__",      0x2000, 0x0, 2, "x64a1")
+AVR_MCU ("atxmega64a1u",     ARCH_AVRXMEGA5, AVR_ISA_RMW,  "__AVR_ATxmega64A1U__",     0x2000, 0x0, 2, "x64a1u")
 /* Xmega, 128K < Flash, RAM <= 64K */
-AVR_MCU ("avrxmega6",        ARCH_AVRXMEGA6, AVR_ISA_NONE, NULL,                       0x2000, 6, "x128a3")
-AVR_MCU ("atxmega128a3",     ARCH_AVRXMEGA6, AVR_ISA_NONE, "__AVR_ATxmega128A3__",     0x2000, 3, "x128a3")
-AVR_MCU ("atxmega128d3",     ARCH_AVRXMEGA6, AVR_ISA_NONE, "__AVR_ATxmega128D3__",     0x2000, 3, "x128d3")
-AVR_MCU ("atxmega192a3",     ARCH_AVRXMEGA6, AVR_ISA_NONE, "__AVR_ATxmega192A3__",     0x2000, 4, "x192a3")
-AVR_MCU ("atxmega192d3",     ARCH_AVRXMEGA6, AVR_ISA_NONE, "__AVR_ATxmega192D3__",     0x2000, 4, "x192d3")
-AVR_MCU ("atxmega256a3",     ARCH_AVRXMEGA6, AVR_ISA_NONE, "__AVR_ATxmega256A3__",     0x2000, 5, "x256a3")
-AVR_MCU ("atxmega256a3b",    ARCH_AVRXMEGA6, AVR_ISA_NONE, "__AVR_ATxmega256A3B__",    0x2000, 5, "x256a3b")
-AVR_MCU ("atxmega256a3bu",   ARCH_AVRXMEGA6, AVR_ISA_NONE, "__AVR_ATxmega256A3BU__",   0x2000, 5, "x256a3bu")
-AVR_MCU ("atxmega256d3",     ARCH_AVRXMEGA6, AVR_ISA_NONE, "__AVR_ATxmega256D3__",     0x2000, 5, "x256d3")
-AVR_MCU ("atxmega128a3u",    ARCH_AVRXMEGA6, AVR_ISA_RMW, "__AVR_ATxmega128A3U__",    0x2000, 3, "x128a3u")
-AVR_MCU ("atxmega128b1",     ARCH_AVRXMEGA6, AVR_ISA_RMW,  "__AVR_ATxmega128B1__",     0x2000, 3, "x128b1")
-AVR_MCU ("atxmega128b3",     ARCH_AVRXMEGA6, AVR_ISA_RMW,  "__AVR_ATxmega128B3__",     0x2000, 3, "x128b3")
-AVR_MCU ("atxmega128c3",     ARCH_AVRXMEGA6, AVR_ISA_RMW,  "__AVR_ATxmega128C3__",     0x2000, 3, "x128c3")
-AVR_MCU ("atxmega128d4",     ARCH_AVRXMEGA6, AVR_ISA_NONE, "__AVR_ATxmega128D4__",     0x2000, 3, "x128d4")
-AVR_MCU ("atmxt540s",        ARCH_AVRXMEGA6, AVR_ISA_NONE, "__AVR_ATMXT540S__",        0x2000, 2, "mxt540s")
-AVR_MCU ("atmxt540sreva",    ARCH_AVRXMEGA6, AVR_ISA_NONE, "__AVR_ATMXT540SREVA__",    0x2000, 2, "mxt540sreva")
-AVR_MCU ("atxmega192a3u",    ARCH_AVRXMEGA6, AVR_ISA_RMW,  "__AVR_ATxmega192A3U__",    0x2000, 4, "x192a3u")
-AVR_MCU ("atxmega192c3",     ARCH_AVRXMEGA6, AVR_ISA_RMW,  "__AVR_ATxmega192C3__",     0x2000, 4, "x192c3")
-AVR_MCU ("atxmega256a3u",    ARCH_AVRXMEGA6, AVR_ISA_RMW,  "__AVR_ATxmega256A3U__",    0x2000, 5, "x256a3u")
-AVR_MCU ("atxmega256c3",     ARCH_AVRXMEGA6, AVR_ISA_RMW,  "__AVR_ATxmega256C3__",     0x2000, 5, "x256c3")
-AVR_MCU ("atxmega384c3",     ARCH_AVRXMEGA6, AVR_ISA_RMW,  "__AVR_ATxmega384C3__",     0x2000, 6, "x384c3")
-AVR_MCU ("atxmega384d3",     ARCH_AVRXMEGA6, AVR_ISA_NONE, "__AVR_ATxmega384D3__",     0x2000, 6, "x384d3")
+AVR_MCU ("avrxmega6",        ARCH_AVRXMEGA6, AVR_ISA_NONE, NULL,                       0x2000, 0x0, 6, "x128a3")
+AVR_MCU ("atxmega128a3",     ARCH_AVRXMEGA6, AVR_ISA_NONE, "__AVR_ATxmega128A3__",     0x2000, 0x0, 3, "x128a3")
+AVR_MCU ("atxmega128d3",     ARCH_AVRXMEGA6, AVR_ISA_NONE, "__AVR_ATxmega128D3__",     0x2000, 0x0, 3, "x128d3")
+AVR_MCU ("atxmega192a3",     ARCH_AVRXMEGA6, AVR_ISA_NONE, "__AVR_ATxmega192A3__",     0x2000, 0x0, 4, "x192a3")
+AVR_MCU ("atxmega192d3",     ARCH_AVRXMEGA6, AVR_ISA_NONE, "__AVR_ATxmega192D3__",     0x2000, 0x0, 4, "x192d3")
+AVR_MCU ("atxmega256a3",     ARCH_AVRXMEGA6, AVR_ISA_NONE, "__AVR_ATxmega256A3__",     0x2000, 0x0, 5, "x256a3")
+AVR_MCU ("atxmega256a3b",    ARCH_AVRXMEGA6, AVR_ISA_NONE, "__AVR_ATxmega256A3B__",    0x2000, 0x0, 5, "x256a3b")
+AVR_MCU ("atxmega256a3bu",   ARCH_AVRXMEGA6, AVR_ISA_NONE, "__AVR_ATxmega256A3BU__",   0x2000, 0x0, 5, "x256a3bu")
+AVR_MCU ("atxmega256d3",     ARCH_AVRXMEGA6, AVR_ISA_NONE, "__AVR_ATxmega256D3__",     0x2000, 0x0, 5, "x256d3")
+AVR_MCU ("atxmega128a3u",    ARCH_AVRXMEGA6, AVR_ISA_RMW, "__AVR_ATxmega128A3U__",    0x2000, 0x0, 3, "x128a3u")
+AVR_MCU ("atxmega128b1",     ARCH_AVRXMEGA6, AVR_ISA_RMW,  "__AVR_ATxmega128B1__",     0x2000, 0x0, 3, "x128b1")
+AVR_MCU ("atxmega128b3",     ARCH_AVRXMEGA6, AVR_ISA_RMW,  "__AVR_ATxmega128B3__",     0x2000, 0x0, 3, "x128b3")
+AVR_MCU ("atxmega128c3",     ARCH_AVRXMEGA6, AVR_ISA_RMW,  "__AVR_ATxmega128C3__",     0x2000, 0x0, 3, "x128c3")
+AVR_MCU ("atxmega128d4",     ARCH_AVRXMEGA6, AVR_ISA_NONE, "__AVR_ATxmega128D4__",     0x2000, 0x0, 3, "x128d4")
+AVR_MCU ("atmxt540s",        ARCH_AVRXMEGA6, AVR_ISA_NONE, "__AVR_ATMXT540S__",        0x2000, 0x0, 2, "mxt540s")
+AVR_MCU ("atmxt540sreva",    ARCH_AVRXMEGA6, AVR_ISA_NONE, "__AVR_ATMXT540SREVA__",    0x2000, 0x0, 2, "mxt540sreva")
+AVR_MCU ("atxmega192a3u",    ARCH_AVRXMEGA6, AVR_ISA_RMW,  "__AVR_ATxmega192A3U__",    0x2000, 0x0, 4, "x192a3u")
+AVR_MCU ("atxmega192c3",     ARCH_AVRXMEGA6, AVR_ISA_RMW,  "__AVR_ATxmega192C3__",     0x2000, 0x0, 4, "x192c3")
+AVR_MCU ("atxmega256a3u",    ARCH_AVRXMEGA6, AVR_ISA_RMW,  "__AVR_ATxmega256A3U__",    0x2000, 0x0, 5, "x256a3u")
+AVR_MCU ("atxmega256c3",     ARCH_AVRXMEGA6, AVR_ISA_RMW,  "__AVR_ATxmega256C3__",     0x2000, 0x0, 5, "x256c3")
+AVR_MCU ("atxmega384c3",     ARCH_AVRXMEGA6, AVR_ISA_RMW,  "__AVR_ATxmega384C3__",     0x2000, 0x0, 6, "x384c3")
+AVR_MCU ("atxmega384d3",     ARCH_AVRXMEGA6, AVR_ISA_NONE, "__AVR_ATxmega384D3__",     0x2000, 0x0, 6, "x384d3")
 /* Xmega, 128K < Flash, RAM > 64K RAM.  */
-AVR_MCU ("avrxmega7",        ARCH_AVRXMEGA7, AVR_ISA_NONE, NULL,                       0x2000, 3, "x128a1")
-AVR_MCU ("atxmega128a1",     ARCH_AVRXMEGA7, AVR_ISA_NONE, "__AVR_ATxmega128A1__",     0x2000, 3, "x128a1")
-AVR_MCU ("atxmega128a1u",    ARCH_AVRXMEGA7, AVR_ISA_RMW,  "__AVR_ATxmega128A1U__",    0x2000, 3, "x128a1u")
-AVR_MCU ("atxmega128a4u",    ARCH_AVRXMEGA7, AVR_ISA_RMW,  "__AVR_ATxmega128A4U__",    0x2000, 3, "x128a4u")
+AVR_MCU ("avrxmega7",        ARCH_AVRXMEGA7, AVR_ISA_NONE, NULL,                       0x2000, 0x0, 3, "x128a1")
+AVR_MCU ("atxmega128a1",     ARCH_AVRXMEGA7, AVR_ISA_NONE, "__AVR_ATxmega128A1__",     0x2000, 0x0, 3, "x128a1")
+AVR_MCU ("atxmega128a1u",    ARCH_AVRXMEGA7, AVR_ISA_RMW,  "__AVR_ATxmega128A1U__",    0x2000, 0x0, 3, "x128a1u")
+AVR_MCU ("atxmega128a4u",    ARCH_AVRXMEGA7, AVR_ISA_RMW,  "__AVR_ATxmega128A4U__",    0x2000, 0x0, 3, "x128a4u")
 /* Assembler only.  */
-AVR_MCU ("avr1",                 ARCH_AVR1, AVR_ISA_NONE, NULL,                        0x0060, 1, "s1200")
-AVR_MCU ("at90s1200",            ARCH_AVR1, AVR_ISA_NONE, "__AVR_AT90S1200__",         0x0060, 1, "s1200")
-AVR_MCU ("attiny11",             ARCH_AVR1, AVR_ISA_NONE, "__AVR_ATtiny11__",          0x0060, 1, "tn11")
-AVR_MCU ("attiny12",             ARCH_AVR1, AVR_ISA_NONE, "__AVR_ATtiny12__",          0x0060, 1, "tn12")
-AVR_MCU ("attiny15",             ARCH_AVR1, AVR_ISA_NONE, "__AVR_ATtiny15__",          0x0060, 1, "tn15")
-AVR_MCU ("attiny28",             ARCH_AVR1, AVR_ISA_NONE, "__AVR_ATtiny28__",          0x0060, 1, "tn28")
+AVR_MCU ("avr1",                 ARCH_AVR1, AVR_ISA_NONE, NULL,                        0x0060, 0x0, 1, "s1200")
+AVR_MCU ("at90s1200",            ARCH_AVR1, AVR_ISA_NONE, "__AVR_AT90S1200__",         0x0060, 0x0, 1, "s1200")
+AVR_MCU ("attiny11",             ARCH_AVR1, AVR_ISA_NONE, "__AVR_ATtiny11__",          0x0060, 0x0, 1, "tn11")
+AVR_MCU ("attiny12",             ARCH_AVR1, AVR_ISA_NONE, "__AVR_ATtiny12__",          0x0060, 0x0, 1, "tn12")
+AVR_MCU ("attiny15",             ARCH_AVR1, AVR_ISA_NONE, "__AVR_ATtiny15__",          0x0060, 0x0, 1, "tn15")
+AVR_MCU ("attiny28",             ARCH_AVR1, AVR_ISA_NONE, "__AVR_ATtiny28__",          0x0060, 0x0, 1, "tn28")
diff --git a/gcc/config/avr/avr-tables.opt b/gcc/config/avr/avr-tables.opt
index 4ff2476..fb89134 100644
--- a/gcc/config/avr/avr-tables.opt
+++ b/gcc/config/avr/avr-tables.opt
@@ -282,512 +282,518 @@ EnumValue
 Enum(avr_mcu) String(avr5) Value(85)
 
 EnumValue
-Enum(avr_mcu) String(ata5790) Value(86)
+Enum(avr_mcu) String(ata5782) Value(86)
 
 EnumValue
-Enum(avr_mcu) String(ata5790n) Value(87)
+Enum(avr_mcu) String(ata5790) Value(87)
 
 EnumValue
-Enum(avr_mcu) String(ata5795) Value(88)
+Enum(avr_mcu) String(ata5790n) Value(88)
 
 EnumValue
-Enum(avr_mcu) String(ata6613c) Value(89)
+Enum(avr_mcu) String(ata5795) Value(89)
 
 EnumValue
-Enum(avr_mcu) String(ata6614q) Value(90)
+Enum(avr_mcu) String(ata5831) Value(90)
 
 EnumValue
-Enum(avr_mcu) String(atmega16) Value(91)
+Enum(avr_mcu) String(ata6613c) Value(91)
 
 EnumValue
-Enum(avr_mcu) String(atmega16a) Value(92)
+Enum(avr_mcu) String(ata6614q) Value(92)
 
 EnumValue
-Enum(avr_mcu) String(atmega161) Value(93)
+Enum(avr_mcu) String(atmega16) Value(93)
 
 EnumValue
-Enum(avr_mcu) String(atmega162) Value(94)
+Enum(avr_mcu) String(atmega16a) Value(94)
 
 EnumValue
-Enum(avr_mcu) String(atmega163) Value(95)
+Enum(avr_mcu) String(atmega161) Value(95)
 
 EnumValue
-Enum(avr_mcu) String(atmega164a) Value(96)
+Enum(avr_mcu) String(atmega162) Value(96)
 
 EnumValue
-Enum(avr_mcu) String(atmega164p) Value(97)
+Enum(avr_mcu) String(atmega163) Value(97)
 
 EnumValue
-Enum(avr_mcu) String(atmega164pa) Value(98)
+Enum(avr_mcu) String(atmega164a) Value(98)
 
 EnumValue
-Enum(avr_mcu) String(atmega165) Value(99)
+Enum(avr_mcu) String(atmega164p) Value(99)
 
 EnumValue
-Enum(avr_mcu) String(atmega165a) Value(100)
+Enum(avr_mcu) String(atmega164pa) Value(100)
 
 EnumValue
-Enum(avr_mcu) String(atmega165p) Value(101)
+Enum(avr_mcu) String(atmega165) Value(101)
 
 EnumValue
-Enum(avr_mcu) String(atmega165pa) Value(102)
+Enum(avr_mcu) String(atmega165a) Value(102)
 
 EnumValue
-Enum(avr_mcu) String(atmega168) Value(103)
+Enum(avr_mcu) String(atmega165p) Value(103)
 
 EnumValue
-Enum(avr_mcu) String(atmega168a) Value(104)
+Enum(avr_mcu) String(atmega165pa) Value(104)
 
 EnumValue
-Enum(avr_mcu) String(atmega168p) Value(105)
+Enum(avr_mcu) String(atmega168) Value(105)
 
 EnumValue
-Enum(avr_mcu) String(atmega168pa) Value(106)
+Enum(avr_mcu) String(atmega168a) Value(106)
 
 EnumValue
-Enum(avr_mcu) String(atmega169) Value(107)
+Enum(avr_mcu) String(atmega168p) Value(107)
 
 EnumValue
-Enum(avr_mcu) String(atmega169a) Value(108)
+Enum(avr_mcu) String(atmega168pa) Value(108)
 
 EnumValue
-Enum(avr_mcu) String(atmega169p) Value(109)
+Enum(avr_mcu) String(atmega169) Value(109)
 
 EnumValue
-Enum(avr_mcu) String(atmega169pa) Value(110)
+Enum(avr_mcu) String(atmega169a) Value(110)
 
 EnumValue
-Enum(avr_mcu) String(atmega16hvb) Value(111)
+Enum(avr_mcu) String(atmega169p) Value(111)
 
 EnumValue
-Enum(avr_mcu) String(atmega16hvbrevb) Value(112)
+Enum(avr_mcu) String(atmega169pa) Value(112)
 
 EnumValue
-Enum(avr_mcu) String(atmega16m1) Value(113)
+Enum(avr_mcu) String(atmega16hvb) Value(113)
 
 EnumValue
-Enum(avr_mcu) String(atmega16u4) Value(114)
+Enum(avr_mcu) String(atmega16hvbrevb) Value(114)
 
 EnumValue
-Enum(avr_mcu) String(atmega26hvg) Value(115)
+Enum(avr_mcu) String(atmega16m1) Value(115)
 
 EnumValue
-Enum(avr_mcu) String(atmega32a) Value(116)
+Enum(avr_mcu) String(atmega16u4) Value(116)
 
 EnumValue
-Enum(avr_mcu) String(atmega32) Value(117)
+Enum(avr_mcu) String(atmega26hvg) Value(117)
 
 EnumValue
-Enum(avr_mcu) String(atmega323) Value(118)
+Enum(avr_mcu) String(atmega32a) Value(118)
 
 EnumValue
-Enum(avr_mcu) String(atmega324a) Value(119)
+Enum(avr_mcu) String(atmega32) Value(119)
 
 EnumValue
-Enum(avr_mcu) String(atmega324p) Value(120)
+Enum(avr_mcu) String(atmega323) Value(120)
 
 EnumValue
-Enum(avr_mcu) String(atmega324pa) Value(121)
+Enum(avr_mcu) String(atmega324a) Value(121)
 
 EnumValue
-Enum(avr_mcu) String(atmega325) Value(122)
+Enum(avr_mcu) String(atmega324p) Value(122)
 
 EnumValue
-Enum(avr_mcu) String(atmega325a) Value(123)
+Enum(avr_mcu) String(atmega324pa) Value(123)
 
 EnumValue
-Enum(avr_mcu) String(atmega325p) Value(124)
+Enum(avr_mcu) String(atmega325) Value(124)
 
 EnumValue
-Enum(avr_mcu) String(atmega3250) Value(125)
+Enum(avr_mcu) String(atmega325a) Value(125)
 
 EnumValue
-Enum(avr_mcu) String(atmega3250a) Value(126)
+Enum(avr_mcu) String(atmega325p) Value(126)
 
 EnumValue
-Enum(avr_mcu) String(atmega3250p) Value(127)
+Enum(avr_mcu) String(atmega3250) Value(127)
 
 EnumValue
-Enum(avr_mcu) String(atmega3250pa) Value(128)
+Enum(avr_mcu) String(atmega3250a) Value(128)
 
 EnumValue
-Enum(avr_mcu) String(atmega328) Value(129)
+Enum(avr_mcu) String(atmega3250p) Value(129)
 
 EnumValue
-Enum(avr_mcu) String(atmega328p) Value(130)
+Enum(avr_mcu) String(atmega3250pa) Value(130)
 
 EnumValue
-Enum(avr_mcu) String(atmega329) Value(131)
+Enum(avr_mcu) String(atmega328) Value(131)
 
 EnumValue
-Enum(avr_mcu) String(atmega329a) Value(132)
+Enum(avr_mcu) String(atmega328p) Value(132)
 
 EnumValue
-Enum(avr_mcu) String(atmega329p) Value(133)
+Enum(avr_mcu) String(atmega329) Value(133)
 
 EnumValue
-Enum(avr_mcu) String(atmega329pa) Value(134)
+Enum(avr_mcu) String(atmega329a) Value(134)
 
 EnumValue
-Enum(avr_mcu) String(atmega3290) Value(135)
+Enum(avr_mcu) String(atmega329p) Value(135)
 
 EnumValue
-Enum(avr_mcu) String(atmega3290a) Value(136)
+Enum(avr_mcu) String(atmega329pa) Value(136)
 
 EnumValue
-Enum(avr_mcu) String(atmega3290p) Value(137)
+Enum(avr_mcu) String(atmega3290) Value(137)
 
 EnumValue
-Enum(avr_mcu) String(atmega3290pa) Value(138)
+Enum(avr_mcu) String(atmega3290a) Value(138)
 
 EnumValue
-Enum(avr_mcu) String(atmega32c1) Value(139)
+Enum(avr_mcu) String(atmega3290p) Value(139)
 
 EnumValue
-Enum(avr_mcu) String(atmega32m1) Value(140)
+Enum(avr_mcu) String(atmega3290pa) Value(140)
 
 EnumValue
-Enum(avr_mcu) String(atmega32u4) Value(141)
+Enum(avr_mcu) String(atmega32c1) Value(141)
 
 EnumValue
-Enum(avr_mcu) String(atmega32u6) Value(142)
+Enum(avr_mcu) String(atmega32m1) Value(142)
 
 EnumValue
-Enum(avr_mcu) String(atmega406) Value(143)
+Enum(avr_mcu) String(atmega32u4) Value(143)
 
 EnumValue
-Enum(avr_mcu) String(atmega64) Value(144)
+Enum(avr_mcu) String(atmega32u6) Value(144)
 
 EnumValue
-Enum(avr_mcu) String(atmega64a) Value(145)
+Enum(avr_mcu) String(atmega406) Value(145)
 
 EnumValue
-Enum(avr_mcu) String(atmega640) Value(146)
+Enum(avr_mcu) String(atmega64) Value(146)
 
 EnumValue
-Enum(avr_mcu) String(atmega644) Value(147)
+Enum(avr_mcu) String(atmega64a) Value(147)
 
 EnumValue
-Enum(avr_mcu) String(atmega644a) Value(148)
+Enum(avr_mcu) String(atmega640) Value(148)
 
 EnumValue
-Enum(avr_mcu) String(atmega644p) Value(149)
+Enum(avr_mcu) String(atmega644) Value(149)
 
 EnumValue
-Enum(avr_mcu) String(atmega644pa) Value(150)
+Enum(avr_mcu) String(atmega644a) Value(150)
 
 EnumValue
-Enum(avr_mcu) String(atmega645) Value(151)
+Enum(avr_mcu) String(atmega644p) Value(151)
 
 EnumValue
-Enum(avr_mcu) String(atmega645a) Value(152)
+Enum(avr_mcu) String(atmega644pa) Value(152)
 
 EnumValue
-Enum(avr_mcu) String(atmega645p) Value(153)
+Enum(avr_mcu) String(atmega645) Value(153)
 
 EnumValue
-Enum(avr_mcu) String(atmega6450) Value(154)
+Enum(avr_mcu) String(atmega645a) Value(154)
 
 EnumValue
-Enum(avr_mcu) String(atmega6450a) Value(155)
+Enum(avr_mcu) String(atmega645p) Value(155)
 
 EnumValue
-Enum(avr_mcu) String(atmega6450p) Value(156)
+Enum(avr_mcu) String(atmega6450) Value(156)
 
 EnumValue
-Enum(avr_mcu) String(atmega649) Value(157)
+Enum(avr_mcu) String(atmega6450a) Value(157)
 
 EnumValue
-Enum(avr_mcu) String(atmega649a) Value(158)
+Enum(avr_mcu) String(atmega6450p) Value(158)
 
 EnumValue
-Enum(avr_mcu) String(atmega649p) Value(159)
+Enum(avr_mcu) String(atmega649) Value(159)
 
 EnumValue
-Enum(avr_mcu) String(atmega6490) Value(160)
+Enum(avr_mcu) String(atmega649a) Value(160)
 
 EnumValue
-Enum(avr_mcu) String(atmega16hva) Value(161)
+Enum(avr_mcu) String(atmega649p) Value(161)
 
 EnumValue
-Enum(avr_mcu) String(atmega16hva2) Value(162)
+Enum(avr_mcu) String(atmega6490) Value(162)
 
 EnumValue
-Enum(avr_mcu) String(atmega32hvb) Value(163)
+Enum(avr_mcu) String(atmega16hva) Value(163)
 
 EnumValue
-Enum(avr_mcu) String(atmega6490a) Value(164)
+Enum(avr_mcu) String(atmega16hva2) Value(164)
 
 EnumValue
-Enum(avr_mcu) String(atmega6490p) Value(165)
+Enum(avr_mcu) String(atmega32hvb) Value(165)
 
 EnumValue
-Enum(avr_mcu) String(atmega64c1) Value(166)
+Enum(avr_mcu) String(atmega6490a) Value(166)
 
 EnumValue
-Enum(avr_mcu) String(atmega64m1) Value(167)
+Enum(avr_mcu) String(atmega6490p) Value(167)
 
 EnumValue
-Enum(avr_mcu) String(atmega64hve) Value(168)
+Enum(avr_mcu) String(atmega64c1) Value(168)
 
 EnumValue
-Enum(avr_mcu) String(atmega64rfa2) Value(169)
+Enum(avr_mcu) String(atmega64m1) Value(169)
 
 EnumValue
-Enum(avr_mcu) String(atmega64rfr2) Value(170)
+Enum(avr_mcu) String(atmega64hve) Value(170)
 
 EnumValue
-Enum(avr_mcu) String(atmega32hvbrevb) Value(171)
+Enum(avr_mcu) String(atmega64rfa2) Value(171)
 
 EnumValue
-Enum(avr_mcu) String(atmega48hvf) Value(172)
+Enum(avr_mcu) String(atmega64rfr2) Value(172)
 
 EnumValue
-Enum(avr_mcu) String(at90can32) Value(173)
+Enum(avr_mcu) String(atmega32hvbrevb) Value(173)
 
 EnumValue
-Enum(avr_mcu) String(at90can64) Value(174)
+Enum(avr_mcu) String(atmega48hvf) Value(174)
 
 EnumValue
-Enum(avr_mcu) String(at90pwm161) Value(175)
+Enum(avr_mcu) String(at90can32) Value(175)
 
 EnumValue
-Enum(avr_mcu) String(at90pwm216) Value(176)
+Enum(avr_mcu) String(at90can64) Value(176)
 
 EnumValue
-Enum(avr_mcu) String(at90pwm316) Value(177)
+Enum(avr_mcu) String(at90pwm161) Value(177)
 
 EnumValue
-Enum(avr_mcu) String(at90scr100) Value(178)
+Enum(avr_mcu) String(at90pwm216) Value(178)
 
 EnumValue
-Enum(avr_mcu) String(at90usb646) Value(179)
+Enum(avr_mcu) String(at90pwm316) Value(179)
 
 EnumValue
-Enum(avr_mcu) String(at90usb647) Value(180)
+Enum(avr_mcu) String(at90scr100) Value(180)
 
 EnumValue
-Enum(avr_mcu) String(at94k) Value(181)
+Enum(avr_mcu) String(at90usb646) Value(181)
 
 EnumValue
-Enum(avr_mcu) String(m3000) Value(182)
+Enum(avr_mcu) String(at90usb647) Value(182)
 
 EnumValue
-Enum(avr_mcu) String(avr51) Value(183)
+Enum(avr_mcu) String(at94k) Value(183)
 
 EnumValue
-Enum(avr_mcu) String(atmega128) Value(184)
+Enum(avr_mcu) String(m3000) Value(184)
 
 EnumValue
-Enum(avr_mcu) String(atmega128a) Value(185)
+Enum(avr_mcu) String(avr51) Value(185)
 
 EnumValue
-Enum(avr_mcu) String(atmega1280) Value(186)
+Enum(avr_mcu) String(atmega128) Value(186)
 
 EnumValue
-Enum(avr_mcu) String(atmega1281) Value(187)
+Enum(avr_mcu) String(atmega128a) Value(187)
 
 EnumValue
-Enum(avr_mcu) String(atmega1284) Value(188)
+Enum(avr_mcu) String(atmega1280) Value(188)
 
 EnumValue
-Enum(avr_mcu) String(atmega1284p) Value(189)
+Enum(avr_mcu) String(atmega1281) Value(189)
 
 EnumValue
-Enum(avr_mcu) String(atmega128rfa1) Value(190)
+Enum(avr_mcu) String(atmega1284) Value(190)
 
 EnumValue
-Enum(avr_mcu) String(at90can128) Value(191)
+Enum(avr_mcu) String(atmega1284p) Value(191)
 
 EnumValue
-Enum(avr_mcu) String(at90usb1286) Value(192)
+Enum(avr_mcu) String(atmega128rfa1) Value(192)
 
 EnumValue
-Enum(avr_mcu) String(at90usb1287) Value(193)
+Enum(avr_mcu) String(at90can128) Value(193)
 
 EnumValue
-Enum(avr_mcu) String(avr6) Value(194)
+Enum(avr_mcu) String(at90usb1286) Value(194)
 
 EnumValue
-Enum(avr_mcu) String(atmega2560) Value(195)
+Enum(avr_mcu) String(at90usb1287) Value(195)
 
 EnumValue
-Enum(avr_mcu) String(atmega2561) Value(196)
+Enum(avr_mcu) String(avr6) Value(196)
 
 EnumValue
-Enum(avr_mcu) String(avrxmega2) Value(197)
+Enum(avr_mcu) String(atmega2560) Value(197)
 
 EnumValue
-Enum(avr_mcu) String(atxmega16a4) Value(198)
+Enum(avr_mcu) String(atmega2561) Value(198)
 
 EnumValue
-Enum(avr_mcu) String(atxmega16d4) Value(199)
+Enum(avr_mcu) String(avrxmega2) Value(199)
 
 EnumValue
-Enum(avr_mcu) String(atxmega32a4) Value(200)
+Enum(avr_mcu) String(atxmega16a4) Value(200)
 
 EnumValue
-Enum(avr_mcu) String(atxmega32d4) Value(201)
+Enum(avr_mcu) String(atxmega16d4) Value(201)
 
 EnumValue
-Enum(avr_mcu) String(atxmega32x1) Value(202)
+Enum(avr_mcu) String(atxmega32a4) Value(202)
 
 EnumValue
-Enum(avr_mcu) String(atmxt112sl) Value(203)
+Enum(avr_mcu) String(atxmega32d4) Value(203)
 
 EnumValue
-Enum(avr_mcu) String(atmxt224) Value(204)
+Enum(avr_mcu) String(atxmega32x1) Value(204)
 
 EnumValue
-Enum(avr_mcu) String(atmxt224e) Value(205)
+Enum(avr_mcu) String(atmxt112sl) Value(205)
 
 EnumValue
-Enum(avr_mcu) String(atmxt336s) Value(206)
+Enum(avr_mcu) String(atmxt224) Value(206)
 
 EnumValue
-Enum(avr_mcu) String(atxmega16a4u) Value(207)
+Enum(avr_mcu) String(atmxt224e) Value(207)
 
 EnumValue
-Enum(avr_mcu) String(atxmega16c4) Value(208)
+Enum(avr_mcu) String(atmxt336s) Value(208)
 
 EnumValue
-Enum(avr_mcu) String(atxmega32a4u) Value(209)
+Enum(avr_mcu) String(atxmega16a4u) Value(209)
 
 EnumValue
-Enum(avr_mcu) String(atxmega32c4) Value(210)
+Enum(avr_mcu) String(atxmega16c4) Value(210)
 
 EnumValue
-Enum(avr_mcu) String(atxmega32e5) Value(211)
+Enum(avr_mcu) String(atxmega32a4u) Value(211)
 
 EnumValue
-Enum(avr_mcu) String(avrxmega4) Value(212)
+Enum(avr_mcu) String(atxmega32c4) Value(212)
 
 EnumValue
-Enum(avr_mcu) String(atxmega64a3) Value(213)
+Enum(avr_mcu) String(atxmega32e5) Value(213)
 
 EnumValue
-Enum(avr_mcu) String(atxmega64d3) Value(214)
+Enum(avr_mcu) String(avrxmega4) Value(214)
 
 EnumValue
-Enum(avr_mcu) String(atxmega64a3u) Value(215)
+Enum(avr_mcu) String(atxmega64a3) Value(215)
 
 EnumValue
-Enum(avr_mcu) String(atxmega64a4u) Value(216)
+Enum(avr_mcu) String(atxmega64d3) Value(216)
 
 EnumValue
-Enum(avr_mcu) String(atxmega64b1) Value(217)
+Enum(avr_mcu) String(atxmega64a3u) Value(217)
 
 EnumValue
-Enum(avr_mcu) String(atxmega64b3) Value(218)
+Enum(avr_mcu) String(atxmega64a4u) Value(218)
 
 EnumValue
-Enum(avr_mcu) String(atxmega64c3) Value(219)
+Enum(avr_mcu) String(atxmega64b1) Value(219)
 
 EnumValue
-Enum(avr_mcu) String(atxmega64d4) Value(220)
+Enum(avr_mcu) String(atxmega64b3) Value(220)
 
 EnumValue
-Enum(avr_mcu) String(avrxmega5) Value(221)
+Enum(avr_mcu) String(atxmega64c3) Value(221)
 
 EnumValue
-Enum(avr_mcu) String(atxmega64a1) Value(222)
+Enum(avr_mcu) String(atxmega64d4) Value(222)
 
 EnumValue
-Enum(avr_mcu) String(atxmega64a1u) Value(223)
+Enum(avr_mcu) String(avrxmega5) Value(223)
 
 EnumValue
-Enum(avr_mcu) String(avrxmega6) Value(224)
+Enum(avr_mcu) String(atxmega64a1) Value(224)
 
 EnumValue
-Enum(avr_mcu) String(atxmega128a3) Value(225)
+Enum(avr_mcu) String(atxmega64a1u) Value(225)
 
 EnumValue
-Enum(avr_mcu) String(atxmega128d3) Value(226)
+Enum(avr_mcu) String(avrxmega6) Value(226)
 
 EnumValue
-Enum(avr_mcu) String(atxmega192a3) Value(227)
+Enum(avr_mcu) String(atxmega128a3) Value(227)
 
 EnumValue
-Enum(avr_mcu) String(atxmega192d3) Value(228)
+Enum(avr_mcu) String(atxmega128d3) Value(228)
 
 EnumValue
-Enum(avr_mcu) String(atxmega256a3) Value(229)
+Enum(avr_mcu) String(atxmega192a3) Value(229)
 
 EnumValue
-Enum(avr_mcu) String(atxmega256a3b) Value(230)
+Enum(avr_mcu) String(atxmega192d3) Value(230)
 
 EnumValue
-Enum(avr_mcu) String(atxmega256a3bu) Value(231)
+Enum(avr_mcu) String(atxmega256a3) Value(231)
 
 EnumValue
-Enum(avr_mcu) String(atxmega256d3) Value(232)
+Enum(avr_mcu) String(atxmega256a3b) Value(232)
 
 EnumValue
-Enum(avr_mcu) String(atxmega128a3u) Value(233)
+Enum(avr_mcu) String(atxmega256a3bu) Value(233)
 
 EnumValue
-Enum(avr_mcu) String(atxmega128b1) Value(234)
+Enum(avr_mcu) String(atxmega256d3) Value(234)
 
 EnumValue
-Enum(avr_mcu) String(atxmega128b3) Value(235)
+Enum(avr_mcu) String(atxmega128a3u) Value(235)
 
 EnumValue
-Enum(avr_mcu) String(atxmega128c3) Value(236)
+Enum(avr_mcu) String(atxmega128b1) Value(236)
 
 EnumValue
-Enum(avr_mcu) String(atxmega128d4) Value(237)
+Enum(avr_mcu) String(atxmega128b3) Value(237)
 
 EnumValue
-Enum(avr_mcu) String(atmxt540s) Value(238)
+Enum(avr_mcu) String(atxmega128c3) Value(238)
 
 EnumValue
-Enum(avr_mcu) String(atmxt540sreva) Value(239)
+Enum(avr_mcu) String(atxmega128d4) Value(239)
 
 EnumValue
-Enum(avr_mcu) String(atxmega192a3u) Value(240)
+Enum(avr_mcu) String(atmxt540s) Value(240)
 
 EnumValue
-Enum(avr_mcu) String(atxmega192c3) Value(241)
+Enum(avr_mcu) String(atmxt540sreva) Value(241)
 
 EnumValue
-Enum(avr_mcu) String(atxmega256a3u) Value(242)
+Enum(avr_mcu) String(atxmega192a3u) Value(242)
 
 EnumValue
-Enum(avr_mcu) String(atxmega256c3) Value(243)
+Enum(avr_mcu) String(atxmega192c3) Value(243)
 
 EnumValue
-Enum(avr_mcu) String(atxmega384c3) Value(244)
+Enum(avr_mcu) String(atxmega256a3u) Value(244)
 
 EnumValue
-Enum(avr_mcu) String(atxmega384d3) Value(245)
+Enum(avr_mcu) String(atxmega256c3) Value(245)
 
 EnumValue
-Enum(avr_mcu) String(avrxmega7) Value(246)
+Enum(avr_mcu) String(atxmega384c3) Value(246)
 
 EnumValue
-Enum(avr_mcu) String(atxmega128a1) Value(247)
+Enum(avr_mcu) String(atxmega384d3) Value(247)
 
 EnumValue
-Enum(avr_mcu) String(atxmega128a1u) Value(248)
+Enum(avr_mcu) String(avrxmega7) Value(248)
 
 EnumValue
-Enum(avr_mcu) String(atxmega128a4u) Value(249)
+Enum(avr_mcu) String(atxmega128a1) Value(249)
 
 EnumValue
-Enum(avr_mcu) String(avr1) Value(250)
+Enum(avr_mcu) String(atxmega128a1u) Value(250)
 
 EnumValue
-Enum(avr_mcu) String(at90s1200) Value(251)
+Enum(avr_mcu) String(atxmega128a4u) Value(251)
 
 EnumValue
-Enum(avr_mcu) String(attiny11) Value(252)
+Enum(avr_mcu) String(avr1) Value(252)
 
 EnumValue
-Enum(avr_mcu) String(attiny12) Value(253)
+Enum(avr_mcu) String(at90s1200) Value(253)
 
 EnumValue
-Enum(avr_mcu) String(attiny15) Value(254)
+Enum(avr_mcu) String(attiny11) Value(254)
 
 EnumValue
-Enum(avr_mcu) String(attiny28) Value(255)
+Enum(avr_mcu) String(attiny12) Value(255)
+
+EnumValue
+Enum(avr_mcu) String(attiny15) Value(256)
+
+EnumValue
+Enum(avr_mcu) String(attiny28) Value(257)
 
diff --git a/gcc/config/avr/avr.h b/gcc/config/avr/avr.h
index 9d34983..921502e 100644
--- a/gcc/config/avr/avr.h
+++ b/gcc/config/avr/avr.h
@@ -491,6 +491,7 @@ typedef struct avr_args
 extern const char *avr_device_to_as (int argc, const char **argv);
 extern const char *avr_device_to_ld (int argc, const char **argv);
 extern const char *avr_device_to_data_start (int argc, const char **argv);
+extern const char *avr_device_to_text_start (int argc, const char **argv);
 extern const char *avr_device_to_startfiles (int argc, const char **argv);
 extern const char *avr_device_to_devicelib (int argc, const char **argv);
 extern const char *avr_device_to_sp8 (int argc, const char **argv);
@@ -499,6 +500,7 @@ extern const char *avr_device_to_sp8 (int argc, const char **argv);
   { "device_to_as", avr_device_to_as },                 \
   { "device_to_ld", avr_device_to_ld },                 \
   { "device_to_data_start", avr_device_to_data_start }, \
+  { "device_to_text_start", avr_device_to_text_start }, \
   { "device_to_startfile", avr_device_to_startfiles },  \
   { "device_to_devicelib", avr_device_to_devicelib },   \
   { "device_to_sp8", avr_device_to_sp8 },
@@ -525,6 +527,7 @@ extern const char *avr_device_to_sp8 (int argc, const char **argv);
                                mmcu=at90usb64*:--pmem-wrap-around=64k}}}\
 %:device_to_ld(%{mmcu=*:%*})\
 %:device_to_data_start(%{mmcu=*:%*})\
+%:device_to_text_start(%{mmcu=*:%*}) \
 %{shared:%eshared is not supported}"
 
 #define LIB_SPEC \
diff --git a/gcc/config/avr/driver-avr.c b/gcc/config/avr/driver-avr.c
index 76c8b39..72bf7bd 100644
--- a/gcc/config/avr/driver-avr.c
+++ b/gcc/config/avr/driver-avr.c
@@ -101,6 +101,30 @@ avr_device_to_data_start (int argc, const char **argv)
   return concat ("-Tdata ", data_section_start_str, NULL);    
 }
 
+/* Returns command line parameters that describe start of text section.  */
+
+const char *
+avr_device_to_text_start (int argc, const char **argv)
+{
+  unsigned long text_section_start;
+  char text_section_start_str[16];
+
+  if (0 == argc)
+    return NULL;
+
+  avr_set_current_device (argv[0]);
+
+  if (avr_current_device->text_section_start == 0x0)
+    return NULL;
+
+  text_section_start = avr_current_device->text_section_start;
+
+  snprintf (text_section_start_str, sizeof(text_section_start_str) - 1,
+            "0x%lX", text_section_start);
+
+  return concat ("-Ttext ", text_section_start_str, NULL);
+}
+
 /* Returns command line parameters that describe the device startfile.  */
 
 const char *
diff --git a/gcc/config/avr/t-multilib b/gcc/config/avr/t-multilib
index 0ea5c45..d04a4d3 100644
--- a/gcc/config/avr/t-multilib
+++ b/gcc/config/avr/t-multilib
@@ -119,9 +119,11 @@ MULTILIB_MATCHES = \
 	mmcu?avr4=mmcu?at90pwm3 \
 	mmcu?avr4=mmcu?at90pwm3b \
 	mmcu?avr4=mmcu?at90pwm81 \
+	mmcu?avr5=mmcu?ata5782 \
 	mmcu?avr5=mmcu?ata5790 \
 	mmcu?avr5=mmcu?ata5790n \
 	mmcu?avr5=mmcu?ata5795 \
+	mmcu?avr5=mmcu?ata5831 \
 	mmcu?avr5=mmcu?ata6613c \
 	mmcu?avr5=mmcu?ata6614q \
 	mmcu?avr5=mmcu?atmega16 \
diff --git a/gcc/doc/avr-mmcu.texi b/gcc/doc/avr-mmcu.texi
index 1381aad..804efd4 100644
--- a/gcc/doc/avr-mmcu.texi
+++ b/gcc/doc/avr-mmcu.texi
@@ -38,7 +38,7 @@
 
 @item avr5
 ``Enhanced'' devices with 16@tie{}KiB up to 64@tie{}KiB of program memory.
-@*@var{mcu}@tie{}= @code{ata5790}, @code{ata5790n}, @code{ata5795}, @code{ata6613c}, @code{ata6614q}, @code{atmega16}, @code{atmega16a}, @code{atmega16hva}, @code{atmega16hva2}, @code{atmega16hvb}, @code{atmega16hvbrevb}, @code{atmega16m1}, @code{atmega16u4}, @code{atmega161}, @code{atmega162}, @code{atmega163}, @code{atmega164a}, @code{atmega164p}, @code{atmega164pa}, @code{atmega165}, @code{atmega165a}, @code{atmega165p}, @code{atmega165pa}, @code{atmega168}, @code{atmega168a}, @code{atmega168p}, @code{atmega168pa}, @code{atmega169}, @code{atmega169a}, @code{atmega169p}, @code{atmega169pa}, @code{atmega26hvg}, @code{atmega32}, @code{atmega32a}, @code{atmega32c1}, @code{atmega32hvb}, @code{atmega32hvbrevb}, @code{atmega32m1}, @code{atmega32u4}, @code{atmega32u6}, @code{atmega323}, @code{atmega324a}, @code{atmega324p}, @code{atmega324pa}, @code{atmega325}, @code{atmega325a}, @code{atmega325p}, @code{atmega3250}, @code{atmega3250a}, @code{atmega3250p}, @code{atmega3250pa}, @code{atmega328}, @code{atmega328p}, @code{atmega329}, @code{atmega329a}, @code{atmega329p}, @code{atmega329pa}, @code{atmega3290}, @code{atmega3290a}, @code{atmega3290p}, @code{atmega3290pa}, @code{atmega406}, @code{atmega48hvf}, @code{atmega64}, @code{atmega64a}, @code{atmega64c1}, @code{atmega64hve}, @code{atmega64m1}, @code{atmega64rfa2}, @code{atmega64rfr2}, @code{atmega640}, @code{atmega644}, @code{atmega644a}, @code{atmega644p}, @code{atmega644pa}, @code{atmega645}, @code{atmega645a}, @code{atmega645p}, @code{atmega6450}, @code{atmega6450a}, @code{atmega6450p}, @code{atmega649}, @code{atmega649a}, @code{atmega649p}, @code{atmega6490}, @code{atmega6490a}, @code{atmega6490p}, @code{at90can32}, @code{at90can64}, @code{at90pwm161}, @code{at90pwm216}, @code{at90pwm316}, @code{at90scr100}, @code{at90usb646}, @code{at90usb647}, @code{at94k}, @code{m3000}.
+@*@var{mcu}@tie{}= @code{ata5782}, @code{ata5790}, @code{ata5790n}, @code{ata5795}, @code{ata5831}, @code{ata6613c}, @code{ata6614q}, @code{atmega16}, @code{atmega16a}, @code{atmega16hva}, @code{atmega16hva2}, @code{atmega16hvb}, @code{atmega16hvbrevb}, @code{atmega16m1}, @code{atmega16u4}, @code{atmega161}, @code{atmega162}, @code{atmega163}, @code{atmega164a}, @code{atmega164p}, @code{atmega164pa}, @code{atmega165}, @code{atmega165a}, @code{atmega165p}, @code{atmega165pa}, @code{atmega168}, @code{atmega168a}, @code{atmega168p}, @code{atmega168pa}, @code{atmega169}, @code{atmega169a}, @code{atmega169p}, @code{atmega169pa}, @code{atmega26hvg}, @code{atmega32}, @code{atmega32a}, @code{atmega32c1}, @code{atmega32hvb}, @code{atmega32hvbrevb}, @code{atmega32m1}, @code{atmega32u4}, @code{atmega32u6}, @code{atmega323}, @code{atmega324a}, @code{atmega324p}, @code{atmega324pa}, @code{atmega325}, @code{atmega325a}, @code{atmega325p}, @code{atmega3250}, @code{atmega3250a}, @code{atmega3250p}, @code{atmega3250pa}, @code{atmega328}, @code{atmega328p}, @code{atmega329}, @code{atmega329a}, @code{atmega329p}, @code{atmega329pa}, @code{atmega3290}, @code{atmega3290a}, @code{atmega3290p}, @code{atmega3290pa}, @code{atmega406}, @code{atmega48hvf}, @code{atmega64}, @code{atmega64a}, @code{atmega64c1}, @code{atmega64hve}, @code{atmega64m1}, @code{atmega64rfa2}, @code{atmega64rfr2}, @code{atmega640}, @code{atmega644}, @code{atmega644a}, @code{atmega644p}, @code{atmega644pa}, @code{atmega645}, @code{atmega645a}, @code{atmega645p}, @code{atmega6450}, @code{atmega6450a}, @code{atmega6450p}, @code{atmega649}, @code{atmega649a}, @code{atmega649p}, @code{atmega6490}, @code{atmega6490a}, @code{atmega6490p}, @code{at90can32}, @code{at90can64}, @code{at90pwm161}, @code{at90pwm216}, @code{at90pwm316}, @code{at90scr100}, @code{at90usb646}, @code{at90usb647}, @code{at94k}, @code{m3000}.
 
 @item avr51
 ``Enhanced'' devices with 128@tie{}KiB of program memory.

^ permalink raw reply	[flat|nested] 4+ messages in thread

* Re: [Patch, avr] Add atmel ata5782 and ata5831 devices
  2014-07-11  8:51 [Patch, avr] Add atmel ata5782 and ata5831 devices S, Pitchumani
@ 2014-07-11 16:22 ` Denis Chertykov
  2014-07-14 11:49   ` S, Pitchumani
  0 siblings, 1 reply; 4+ messages in thread
From: Denis Chertykov @ 2014-07-11 16:22 UTC (permalink / raw)
  To: S, Pitchumani; +Cc: gcc-patches, Georg-Johann Lay

2014-07-11 12:50 GMT+04:00 S, Pitchumani <Pitchumani.S@atmel.com>:
> This patch adds supports for Atmel's ata5782 and ata5831 devices.
>
> These devices ISA matches with AVR5 architecture except that text section
> start for these two devices is 0x8000. By default 0x0 is used as the text
> start address. This patch adds a device attribute for text start and that
> is passed to Linker via -Ttext option.
>
> If OK, could someone commit please?
>
> Regards,
> Pitchumani
>
> 2014-07-11  Pitchumani Sivanupandi  <pitchumani.s@atmel.com>
>
>     * config/avr/avr-arch.h (avr_mcu_t): Add text section start attribute.
>     * config/avr/avr-devices.c (AVR_MCU): Same.
>     (avr_mcu_types): add text start value to end of device list.
>     * config/avr/avr-mcus.def: Add text section start for all devices.
>     (ata5782): Add new avr5 device.
>     (ata5831): Same.
>     * config/avr/avr-tables.opt: Regenerate.
>     * config/avr/avr.h: Add declaration for text section start handler.
>     (EXTRA_SPEC_FUNCTIONS): Add text section start handler to SPEC functions.
>     (LINK_SPEC): Include text section start handler to linker spec.
>     * config/avr/driver-avr.c (avr_device_to_text_start): New function to
>     pass -Ttext option to linker if the text section start for the device is
>     not zero.
>     * config/avr/t-multilib: Regenerate.
>     * doc/avr-mmcu.texi: Regenerate.
>

Committed.

Denis.

^ permalink raw reply	[flat|nested] 4+ messages in thread

* RE: [Patch, avr] Add atmel ata5782 and ata5831 devices
  2014-07-11 16:22 ` Denis Chertykov
@ 2014-07-14 11:49   ` S, Pitchumani
  2014-07-16 17:04     ` Denis Chertykov
  0 siblings, 1 reply; 4+ messages in thread
From: S, Pitchumani @ 2014-07-14 11:49 UTC (permalink / raw)
  To: Denis Chertykov; +Cc: gcc-patches, Georg-Johann Lay

> -----Original Message-----
> From: gcc-patches-owner@gcc.gnu.org [mailto:gcc-patches-owner@gcc.gnu.org]
> On Behalf Of Denis Chertykov
> Sent: Friday, July 11, 2014 9:53 PM
> To: S, Pitchumani
> Cc: gcc-patches@gcc.gnu.org; Georg-Johann Lay
> Subject: Re: [Patch, avr] Add atmel ata5782 and ata5831 devices
> 
> 2014-07-11 12:50 GMT+04:00 S, Pitchumani <Pitchumani.S@atmel.com>:
> > This patch adds supports for Atmel's ata5782 and ata5831 devices.
> >
> > These devices ISA matches with AVR5 architecture except that text
> section
> > start for these two devices is 0x8000. By default 0x0 is used as the
> text
> > start address. This patch adds a device attribute for text start and
> that
> > is passed to Linker via -Ttext option.
> >
> > If OK, could someone commit please?
> >
> > Regards,
> > Pitchumani
> >
> > 2014-07-11  Pitchumani Sivanupandi  <pitchumani.s@atmel.com>
> >
> >     * config/avr/avr-arch.h (avr_mcu_t): Add text section start
> attribute.
> >     * config/avr/avr-devices.c (AVR_MCU): Same.
> >     (avr_mcu_types): add text start value to end of device list.
> >     * config/avr/avr-mcus.def: Add text section start for all devices.
> >     (ata5782): Add new avr5 device.
> >     (ata5831): Same.
> >     * config/avr/avr-tables.opt: Regenerate.
> >     * config/avr/avr.h: Add declaration for text section start handler.
> >     (EXTRA_SPEC_FUNCTIONS): Add text section start handler to SPEC
> functions.
> >     (LINK_SPEC): Include text section start handler to linker spec.
> >     * config/avr/driver-avr.c (avr_device_to_text_start): New function
> to
> >     pass -Ttext option to linker if the text section start for the
> device is
> >     not zero.
> >     * config/avr/t-multilib: Regenerate.
> >     * doc/avr-mmcu.texi: Regenerate.
> >
> 
> Committed.

Hi Denis,

Thanks.

It seems you missed to include gcc/doc/avr-mmcu.texi file changes.

Regards,
Pitchumani

^ permalink raw reply	[flat|nested] 4+ messages in thread

* Re: [Patch, avr] Add atmel ata5782 and ata5831 devices
  2014-07-14 11:49   ` S, Pitchumani
@ 2014-07-16 17:04     ` Denis Chertykov
  0 siblings, 0 replies; 4+ messages in thread
From: Denis Chertykov @ 2014-07-16 17:04 UTC (permalink / raw)
  To: S, Pitchumani; +Cc: gcc-patches, Georg-Johann Lay

2014-07-14 15:44 GMT+04:00 S, Pitchumani <Pitchumani.S@atmel.com>:
>> -----Original Message-----
>> From: gcc-patches-owner@gcc.gnu.org [mailto:gcc-patches-owner@gcc.gnu.org]
>> On Behalf Of Denis Chertykov
>> Sent: Friday, July 11, 2014 9:53 PM
>> To: S, Pitchumani
>> Cc: gcc-patches@gcc.gnu.org; Georg-Johann Lay
>> Subject: Re: [Patch, avr] Add atmel ata5782 and ata5831 devices
>>
>> 2014-07-11 12:50 GMT+04:00 S, Pitchumani <Pitchumani.S@atmel.com>:
>> > This patch adds supports for Atmel's ata5782 and ata5831 devices.
>> >
>> > These devices ISA matches with AVR5 architecture except that text
>> section
>> > start for these two devices is 0x8000. By default 0x0 is used as the
>> text
>> > start address. This patch adds a device attribute for text start and
>> that
>> > is passed to Linker via -Ttext option.
>> >
>> > If OK, could someone commit please?
>> >
>> > Regards,
>> > Pitchumani
>> >
>> > 2014-07-11  Pitchumani Sivanupandi  <pitchumani.s@atmel.com>
>> >
>> >     * config/avr/avr-arch.h (avr_mcu_t): Add text section start
>> attribute.
>> >     * config/avr/avr-devices.c (AVR_MCU): Same.
>> >     (avr_mcu_types): add text start value to end of device list.
>> >     * config/avr/avr-mcus.def: Add text section start for all devices.
>> >     (ata5782): Add new avr5 device.
>> >     (ata5831): Same.
>> >     * config/avr/avr-tables.opt: Regenerate.
>> >     * config/avr/avr.h: Add declaration for text section start handler.
>> >     (EXTRA_SPEC_FUNCTIONS): Add text section start handler to SPEC
>> functions.
>> >     (LINK_SPEC): Include text section start handler to linker spec.
>> >     * config/avr/driver-avr.c (avr_device_to_text_start): New function
>> to
>> >     pass -Ttext option to linker if the text section start for the
>> device is
>> >     not zero.
>> >     * config/avr/t-multilib: Regenerate.
>> >     * doc/avr-mmcu.texi: Regenerate.
>> >
>>
>> Committed.
>
> Hi Denis,
>
> Thanks.
>
> It seems you missed to include gcc/doc/avr-mmcu.texi file changes.

Thank you for checking.

Committed.


Denis.

^ permalink raw reply	[flat|nested] 4+ messages in thread

end of thread, other threads:[~2014-07-16 16:43 UTC | newest]

Thread overview: 4+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2014-07-11  8:51 [Patch, avr] Add atmel ata5782 and ata5831 devices S, Pitchumani
2014-07-11 16:22 ` Denis Chertykov
2014-07-14 11:49   ` S, Pitchumani
2014-07-16 17:04     ` Denis Chertykov

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).