summaryrefslogtreecommitdiffstats
path: root/patches/gcc-4.4.3/atmel/0005-Add-remove-support-for-devices.patch
diff options
context:
space:
mode:
Diffstat (limited to 'patches/gcc-4.4.3/atmel/0005-Add-remove-support-for-devices.patch')
-rw-r--r--patches/gcc-4.4.3/atmel/0005-Add-remove-support-for-devices.patch662
1 files changed, 0 insertions, 662 deletions
diff --git a/patches/gcc-4.4.3/atmel/0005-Add-remove-support-for-devices.patch b/patches/gcc-4.4.3/atmel/0005-Add-remove-support-for-devices.patch
deleted file mode 100644
index fa360e3..0000000
--- a/patches/gcc-4.4.3/atmel/0005-Add-remove-support-for-devices.patch
+++ /dev/null
@@ -1,662 +0,0 @@
-From d4986c50a2e21a5fb7f32c1168d0ab8a02f34de7 Mon Sep 17 00:00:00 2001
-From: Stephan Linz <linz@li-pro.net>
-Date: Wed, 20 Apr 2011 20:44:54 +0200
-Subject: [PATCH 05/10] Add/remove support for devices
-
-Add support for a bunch of new AVR devices, and removes support
-for some listed devices as well: atmega8m1, atmega8c1, atmega16c1,
-atmega4hvd, atmega8hvd, atmega16hva, atmega16hvb, attiny327,
-m3000f, m3000s, m3001b.
-
-Assimilable quote for binutils by Eric Weddington (2010-04-08):
-http://old.nabble.com/-PATCH%2C-AVR--Add-remove-support-for-devices-td28172078.html
-
-Original ATMEL patch from:
-http://distribute.atmel.no/tools/opensource/avr-gcc/gcc-4.4.3/52-gcc-4.4.3-new-devices.patch
-
-Signed-off-by: Stephan Linz <linz@li-pro.net>
----
- gcc/config/avr/avr.c | 63 ++++++++++++++---
- gcc/config/avr/avr.h | 180 ++++++++++++++++++++++++++++++++++++++++++-------
- gcc/config/avr/t-avr | 56 +++++++++++++---
- 3 files changed, 252 insertions(+), 47 deletions(-)
-
-diff --git a/gcc/config/avr/avr.c b/gcc/config/avr/avr.c
-index 60918ac..9c410a5 100644
---- a/gcc/config/avr/avr.c
-+++ b/gcc/config/avr/avr.c
-@@ -200,15 +200,23 @@ static const struct mcu_type_s avr_mcu_types[] = {
- { "attiny13", ARCH_AVR25, "__AVR_ATtiny13__" },
- { "attiny13a", ARCH_AVR25, "__AVR_ATtiny13A__" },
- { "attiny2313", ARCH_AVR25, "__AVR_ATtiny2313__" },
-+ { "attiny2313a", ARCH_AVR25, "__AVR_ATtiny2313A__" },
- { "attiny24", ARCH_AVR25, "__AVR_ATtiny24__" },
-+ { "attiny24a", ARCH_AVR25, "__AVR_ATtiny24A__" },
-+ { "attiny4313", ARCH_AVR25, "__AVR_ATtiny4313__"},
- { "attiny44", ARCH_AVR25, "__AVR_ATtiny44__" },
-+ { "attiny44a", ARCH_AVR25, "__AVR_ATtiny44A__" },
- { "attiny84", ARCH_AVR25, "__AVR_ATtiny84__" },
-+ { "attiny84a", ARCH_AVR25, "__AVR_ATtiny84A__" },
- { "attiny25", ARCH_AVR25, "__AVR_ATtiny25__" },
- { "attiny45", ARCH_AVR25, "__AVR_ATtiny45__" },
- { "attiny85", ARCH_AVR25, "__AVR_ATtiny85__" },
- { "attiny261", ARCH_AVR25, "__AVR_ATtiny261__" },
-+ { "attiny261a", ARCH_AVR25, "__AVR_ATtiny261A__" },
- { "attiny461", ARCH_AVR25, "__AVR_ATtiny461__" },
-+ { "attiny461a", ARCH_AVR25, "__AVR_ATtiny461A__" },
- { "attiny861", ARCH_AVR25, "__AVR_ATtiny861__" },
-+ { "attiny861a", ARCH_AVR25, "__AVR_ATtiny861A__" },
- { "attiny43u", ARCH_AVR25, "__AVR_ATtiny43U__" },
- { "attiny87", ARCH_AVR25, "__AVR_ATtiny87__" },
- { "attiny48", ARCH_AVR25, "__AVR_ATtiny48__" },
-@@ -226,22 +234,23 @@ static const struct mcu_type_s avr_mcu_types[] = {
- { "avr35", ARCH_AVR35, NULL },
- { "at90usb82", ARCH_AVR35, "__AVR_AT90USB82__" },
- { "at90usb162", ARCH_AVR35, "__AVR_AT90USB162__" },
-+ { "atmega8u2", ARCH_AVR35, "__AVR_ATmega8U2__" },
-+ { "atmega16u2", ARCH_AVR35, "__AVR_ATmega16U2__" },
-+ { "atmega32u2", ARCH_AVR35, "__AVR_ATmega32U2__" },
- { "attiny167", ARCH_AVR35, "__AVR_ATtiny167__" },
-- { "attiny327", ARCH_AVR35, "__AVR_ATtiny327__" },
- /* Enhanced, <= 8K. */
- { "avr4", ARCH_AVR4, NULL },
- { "atmega8", ARCH_AVR4, "__AVR_ATmega8__" },
- { "atmega48", ARCH_AVR4, "__AVR_ATmega48__" },
-+ { "atmega48a", ARCH_AVR4, "__AVR_ATmega48A__" },
- { "atmega48p", ARCH_AVR4, "__AVR_ATmega48P__" },
- { "atmega88", ARCH_AVR4, "__AVR_ATmega88__" },
-+ { "atmega88a", ARCH_AVR4, "__AVR_ATmega88A__" },
- { "atmega88p", ARCH_AVR4, "__AVR_ATmega88P__" },
-+ { "atmega88pa", ARCH_AVR4, "__AVR_ATmega88PA__" },
- { "atmega8515", ARCH_AVR4, "__AVR_ATmega8515__" },
- { "atmega8535", ARCH_AVR4, "__AVR_ATmega8535__" },
- { "atmega8hva", ARCH_AVR4, "__AVR_ATmega8HVA__" },
-- { "atmega4hvd", ARCH_AVR4, "__AVR_ATmega4HVD__" },
-- { "atmega8hvd", ARCH_AVR4, "__AVR_ATmega8HVD__" },
-- { "atmega8c1", ARCH_AVR4, "__AVR_ATmega8C1__" },
-- { "atmega8m1", ARCH_AVR4, "__AVR_ATmega8M1__" },
- { "at90pwm1", ARCH_AVR4, "__AVR_AT90PWM1__" },
- { "at90pwm2", ARCH_AVR4, "__AVR_AT90PWM2__" },
- { "at90pwm2b", ARCH_AVR4, "__AVR_AT90PWM2B__" },
-@@ -251,39 +260,73 @@ static const struct mcu_type_s avr_mcu_types[] = {
- /* Enhanced, > 8K, <= 64K. */
- { "avr5", ARCH_AVR5, NULL },
- { "atmega16", ARCH_AVR5, "__AVR_ATmega16__" },
-+ { "atmega16a", ARCH_AVR5, "__AVR_ATmega16A__" },
- { "atmega161", ARCH_AVR5, "__AVR_ATmega161__" },
- { "atmega162", ARCH_AVR5, "__AVR_ATmega162__" },
- { "atmega163", ARCH_AVR5, "__AVR_ATmega163__" },
-+ { "atmega164a", ARCH_AVR5, "__AVR_ATmega164A__" },
- { "atmega164p", ARCH_AVR5, "__AVR_ATmega164P__" },
- { "atmega165", ARCH_AVR5, "__AVR_ATmega165__" },
-+ { "atmega165a", ARCH_AVR5, "__AVR_ATmega165A__" },
- { "atmega165p", ARCH_AVR5, "__AVR_ATmega165P__" },
- { "atmega168", ARCH_AVR5, "__AVR_ATmega168__" },
-+ { "atmega168a", ARCH_AVR5, "__AVR_ATmega168A__" },
- { "atmega168p", ARCH_AVR5, "__AVR_ATmega168P__" },
- { "atmega169", ARCH_AVR5, "__AVR_ATmega169__" },
-+ { "atmega169a", ARCH_AVR5, "__AVR_ATmega169A__" },
- { "atmega169p", ARCH_AVR5, "__AVR_ATmega169P__" },
-+ { "atmega169pa", ARCH_AVR5, "__AVR_ATmega169PA__" },
-+ { "atmega16hva", ARCH_AVR5, "__AVR_ATmega16HVA__" },
-+ { "atmega16hva2", ARCH_AVR5, "__AVR_ATmega16HVA2__" },
-+ { "atmega16hvb", ARCH_AVR5, "__AVR_ATmega16HVB__" },
-+ { "atmega16m1", ARCH_AVR5, "__AVR_ATmega16M1__" },
-+ { "atmega16u4", ARCH_AVR5, "__AVR_ATmega16U4__" },
- { "atmega32", ARCH_AVR5, "__AVR_ATmega32__" },
- { "atmega323", ARCH_AVR5, "__AVR_ATmega323__" },
-+ { "atmega324a", ARCH_AVR5, "__AVR_ATmega324A__" },
- { "atmega324p", ARCH_AVR5, "__AVR_ATmega324P__" },
-+ { "atmega324pa", ARCH_AVR5, "__AVR_ATmega324PA__" },
- { "atmega325", ARCH_AVR5, "__AVR_ATmega325__" },
-+ { "atmega325a", ARCH_AVR5, "__AVR_ATmega325A__" },
- { "atmega325p", ARCH_AVR5, "__AVR_ATmega325P__" },
- { "atmega3250", ARCH_AVR5, "__AVR_ATmega3250__" },
-+ { "atmega3250a", ARCH_AVR5, "__AVR_ATmega3250A__" },
- { "atmega3250p", ARCH_AVR5, "__AVR_ATmega3250P__" },
-+ { "atmega328", ARCH_AVR5, "__AVR_ATmega328__" },
- { "atmega328p", ARCH_AVR5, "__AVR_ATmega328P__" },
- { "atmega329", ARCH_AVR5, "__AVR_ATmega329__" },
-+ { "atmega329a", ARCH_AVR5, "__AVR_ATmega329A__" },
- { "atmega329p", ARCH_AVR5, "__AVR_ATmega329P__" },
-+ { "atmega329pa", ARCH_AVR5, "__AVR_ATmega329PA__" },
- { "atmega3290", ARCH_AVR5, "__AVR_ATmega3290__" },
-+ { "atmega3290a", ARCH_AVR5, "__AVR_ATmega3290A__" },
- { "atmega3290p", ARCH_AVR5, "__AVR_ATmega3290P__" },
-+ { "atmega32c1", ARCH_AVR5, "__AVR_ATmega32C1__" },
-+ { "atmega32m1", ARCH_AVR5, "__AVR_ATmega32M1__" },
-+ { "atmega32u4", ARCH_AVR5, "__AVR_ATmega32U4__" },
-+ { "atmega32u6", ARCH_AVR5, "__AVR_ATmega32U6__" },
- { "atmega406", ARCH_AVR5, "__AVR_ATmega406__" },
- { "atmega64", ARCH_AVR5, "__AVR_ATmega64__" },
- { "atmega640", ARCH_AVR5, "__AVR_ATmega640__" },
- { "atmega644", ARCH_AVR5, "__AVR_ATmega644__" },
-+ { "atmega644a", ARCH_AVR5, "__AVR_ATmega644A__" },
- { "atmega644p", ARCH_AVR5, "__AVR_ATmega644P__" },
-+ { "atmega644pa", ARCH_AVR5, "__AVR_ATmega644PA__" },
-+ { "atmega645a", ARCH_AVR5, "__AVR_ATmega645A__" },
-+ { "atmega645p", ARCH_AVR5, "__AVR_ATmega645P__" },
- { "atmega645", ARCH_AVR5, "__AVR_ATmega645__" },
- { "atmega6450", ARCH_AVR5, "__AVR_ATmega6450__" },
-+ { "atmega6450a", ARCH_AVR5, "__AVR_ATmega6450A__" },
-+ { "atmega6450p", ARCH_AVR5, "__AVR_ATmega6450P__" },
- { "atmega649", ARCH_AVR5, "__AVR_ATmega649__" },
-+ { "atmega649a", ARCH_AVR5, "__AVR_ATmega649A__" },
-+ { "atmega649p", ARCH_AVR5, "__AVR_ATmega649P__" },
- { "atmega6490", ARCH_AVR5, "__AVR_ATmega6490__" },
-- { "atmega16hva", ARCH_AVR5, "__AVR_ATmega16HVA__" },
-- { "atmega16hvb", ARCH_AVR5, "__AVR_ATmega16HVB__" },
-+ { "atmega6490a", ARCH_AVR5, "__AVR_ATmega6490A__" },
-+ { "atmega6490p", ARCH_AVR5, "__AVR_ATmega6490P__" },
-+ { "atmega64c1", ARCH_AVR5, "__AVR_ATmega64C1__" },
-+ { "atmega64m1", ARCH_AVR5, "__AVR_ATmega64M1__" },
-+ { "atmega64hve", ARCH_AVR5, "__AVR_ATmega64HVE__" },
- { "atmega32hvb", ARCH_AVR5, "__AVR_ATmega32HVB__" },
- { "at90can32", ARCH_AVR5, "__AVR_AT90CAN32__" },
- { "at90can64", ARCH_AVR5, "__AVR_AT90CAN64__" },
-@@ -302,19 +345,17 @@ static const struct mcu_type_s avr_mcu_types[] = {
- { "at90usb646", ARCH_AVR5, "__AVR_AT90USB646__" },
- { "at90usb647", ARCH_AVR5, "__AVR_AT90USB647__" },
- { "at94k", ARCH_AVR5, "__AVR_AT94K__" },
-+ { "m3000", ARCH_AVR5, "__AVR_M3000__" },
- /* Enhanced, == 128K. */
- { "avr51", ARCH_AVR51, NULL },
- { "atmega128", ARCH_AVR51, "__AVR_ATmega128__" },
- { "atmega1280", ARCH_AVR51, "__AVR_ATmega1280__" },
- { "atmega1281", ARCH_AVR51, "__AVR_ATmega1281__" },
- { "atmega1284p", ARCH_AVR51, "__AVR_ATmega1284P__" },
-- { "atmega128rfa1", ARCH_AVR51, "__AVR_ATmega128RFA1__" },
-+ { "atmega128rfa1",ARCH_AVR51, "__AVR_ATmega128RFA1__" },
- { "at90can128", ARCH_AVR51, "__AVR_AT90CAN128__" },
- { "at90usb1286", ARCH_AVR51, "__AVR_AT90USB1286__" },
- { "at90usb1287", ARCH_AVR51, "__AVR_AT90USB1287__" },
-- { "m3000f", ARCH_AVR51, "__AVR_M3000F__" },
-- { "m3000s", ARCH_AVR51, "__AVR_M3000S__" },
-- { "m3001b", ARCH_AVR51, "__AVR_M3001B__" },
- /* 3-Byte PC. */
- { "avr6", ARCH_AVR6, NULL },
- { "atmega2560", ARCH_AVR6, "__AVR_ATmega2560__" },
-diff --git a/gcc/config/avr/avr.h b/gcc/config/avr/avr.h
-index e580d5e..3cbe842 100644
---- a/gcc/config/avr/avr.h
-+++ b/gcc/config/avr/avr.h
-@@ -841,40 +841,137 @@ mmcu=*:-mmcu=%*}"
- mmcu=ata6289|\
- mmcu=attiny13*|\
- mmcu=attiny2313|\
-+ mmcu=attiny2313a|\
- mmcu=attiny24|\
-+ mmcu=attiny24a|\
- mmcu=attiny25|\
- mmcu=attiny261|\
-- mmcu=attiny4*|\
-- mmcu=attiny8*: -m avr2}\
-+ mmcu=attiny261a|\
-+ mmcu=attiny4313|\
-+ mmcu=attiny43u|\
-+ mmcu=attiny44|\
-+ mmcu=attiny44a|\
-+ mmcu=attiny45|\
-+ mmcu=attiny461|\
-+ mmcu=attiny461a|\
-+ mmcu=attiny48|\
-+ mmcu=attiny84|\
-+ mmcu=attiny84a|\
-+ mmcu=attiny85|\
-+ mmcu=attiny861|\
-+ mmcu=attiny861a|\
-+ mmcu=attiny87|\
-+ mmcu=attiny88: -m avr2}\
- %{mmcu=atmega103|\
-- mmcu=at43*|\
-- mmcu=at76*|\
-+ mmcu=at43usb320|\
-+ mmcu=at43usb355|\
-+ mmcu=at76c711|\
- mmcu=at90usb82|\
- mmcu=at90usb162|\
-+ mmcu=atmega8u2|\
-+ mmcu=atmega16u2|\
-+ mmcu=atmega32u2|\
-+ mmcu=attiny167|\
- mmcu=attiny16*|\
- mmcu=attiny32*: -m avr3}\
--%{mmcu=atmega8*|\
-- mmcu=atmega4*|\
-+%{mmcu=atmega8|\
-+ mmcu=atmega88|\
-+ mmcu=atmega88a|\
-+ mmcu=atmega88p|\
-+ mmcu=atmega88pa|\
-+ mmcu=atmega8515|\
-+ mmcu=atmega8535|\
-+ mmcu=atmega8hva|\
-+ mmcu=atmega48|\
-+ mmcu=atmega48a|\
-+ mmcu=atmega48p|\
- mmcu=at90pwm1|\
- mmcu=at90pwm2|\
- mmcu=at90pwm2b|\
- mmcu=at90pwm3|\
- mmcu=at90pwm3b|\
- mmcu=at90pwm81: -m avr4}\
--%{mmcu=atmega16*|\
-- mmcu=atmega32*|\
-+%{mmcu=atmega16|\
-+ mmcu=atmega16a|\
-+ mmcu=atmega161|\
-+ mmcu=atmega162|\
-+ mmcu=atmega163|\
-+ mmcu=atmega164a|\
-+ mmcu=atmega164p|\
-+ mmcu=atmega165|\
-+ mmcu=atmega165a|\
-+ mmcu=atmega165p|\
-+ mmcu=atmega168|\
-+ mmcu=atmega168a|\
-+ mmcu=atmega168p|\
-+ mmcu=atmega169|\
-+ mmcu=atmega169a|\
-+ mmcu=atmega169p|\
-+ mmcu=atmega169pa|\
-+ mmcu=atmega16hva|\
-+ mmcu=atmega16hva2|\
-+ mmcu=atmega16hvb|\
-+ mmcu=atmega16m1|\
-+ mmcu=atmega16u4|\
-+ mmcu=atmega32|\
-+ mmcu=atmega323|\
-+ mmcu=atmega324a|\
-+ mmcu=atmega324p|\
-+ mmcu=atmega324pa|\
-+ mmcu=atmega325|\
-+ mmcu=atmega325a|\
-+ mmcu=atmega325p|\
-+ mmcu=atmega3250|\
-+ mmcu=atmega3250a|\
-+ mmcu=atmega3250p|\
-+ mmcu=atmega328|\
-+ mmcu=atmega328p|\
-+ mmcu=atmega329|\
-+ mmcu=atmega329a|\
-+ mmcu=atmega329p|\
-+ mmcu=atmega329pa|\
-+ mmcu=atmega3290|\
-+ mmcu=atmega3290a|\
-+ mmcu=atmega3290p|\
-+ mmcu=atmega32c1|\
-+ mmcu=atmega32hvb|\
-+ mmcu=atmega32m1|\
-+ mmcu=atmega32u4|\
-+ mmcu=atmega32u6|\
- mmcu=atmega406|\
-- mmcu=atmega64*|\
-+ mmcu=atmega64|\
-+ mmcu=atmega640|\
-+ mmcu=atmega644|\
-+ mmcu=atmega644a|\
-+ mmcu=atmega644p|\
-+ mmcu=atmega644pa|\
-+ mmcu=atmega645|\
-+ mmcu=atmega645a|\
-+ mmcu=atmega645p|\
-+ mmcu=atmega6450|\
-+ mmcu=atmega6450a|\
-+ mmcu=atmega6450p|\
-+ mmcu=atmega649|\
-+ mmcu=atmega649a|\
-+ mmcu=atmega649p|\
-+ mmcu=atmega6490|\
-+ mmcu=atmega6490a|\
-+ mmcu=atmega6490p|\
-+ mmcu=atmega64c1|\
-+ mmcu=atmega64m1|\
-+ mmcu=atmega64hve|\
- mmcu=atmega128*|\
- mmcu=at90can*|\
- mmcu=at90pwm216|\
- mmcu=at90pwm316|\
-+ mmcu=atmega32c1|\
-+ mmcu=atmega32m1|\
-+ mmcu=atmega32u4|\
- mmcu=at90scr100|\
- mmcu=at90usb64*|\
- mmcu=at90usb128*|\
- mmcu=at94k|\
-- mmcu=m3000*|\
-- mmcu=m3001*: -m avr5}\
-+ mmcu=m3000: -m avr5}\
- %{mmcu=atmega256*:-m avr6}\
- %{mmcu=atxmega16a4|\
- mmcu=atxmega16d4|\
-@@ -892,6 +989,7 @@ mmcu=*:-mmcu=%*}"
- %{mmcu=atxmega128a1:-m avrxmega7} \
- %{mmcu=atmega324*|\
- mmcu=atmega325*|\
-+ mmcu=atmega328|\
- mmcu=atmega328p|\
- mmcu=atmega329*|\
- mmcu=atmega406|\
-@@ -916,14 +1014,10 @@ mmcu=*:-mmcu=%*}"
- mmcu=attiny88|\
- mmcu=attiny87|\
- mmcu=attiny167|\
-- mmcu=attiny327|\
- mmcu=at90can*|\
- mmcu=at90pwm*|\
-- mmcu=atmega8c1|\
-- mmcu=atmega16c1|\
- mmcu=atmega32c1|\
- mmcu=atmega64c1|\
-- mmcu=atmega8m1|\
- mmcu=atmega16m1|\
- mmcu=atmega32m1|\
- mmcu=atmega64m1|\
-@@ -931,14 +1025,17 @@ mmcu=*:-mmcu=%*}"
- mmcu=atmega32u*|\
- mmcu=at90scr100|\
- mmcu=ata6289|\
-+ mmcu=atmega64hve|\
-+ mmcu=atmega8u2|\
-+ mmcu=atmega16u2|\
-+ mmcu=atmega32u2|\
- mmcu=at90usb*: -Tdata 0x800100}\
- %{mmcu=atmega640|\
- mmcu=atmega1280|\
- mmcu=atmega1281|\
- mmcu=atmega256*|\
- mmcu=atmega128rfa1: -Tdata 0x800200}\
--%{mmcu=m3000*|\
-- mmcu=m3001*: -Tdata 0x801000}"
-+%{mmcu=m3000: -Tdata 0x801000}"
-
- #define LIB_SPEC \
- "%{!mmcu=at90s1*:%{!mmcu=attiny11:%{!mmcu=attiny12:%{!mmcu=attiny15:%{!mmcu=attiny28: -lc }}}}}"
-@@ -975,15 +1072,23 @@ mmcu=*:-mmcu=%*}"
- %{mmcu=attiny13:crttn13.o%s} \
- %{mmcu=attiny13a:crttn13a.o%s} \
- %{mmcu=attiny2313|mmcu=avr25:crttn2313.o%s} \
-+%{mmcu=attiny2313a:crttn2313a.o%s} \
- %{mmcu=attiny24:crttn24.o%s} \
-+%{mmcu=attiny24a:crttn24a.o%s} \
-+%{mmcu=attiny4313:crttn4313.o%s} \
- %{mmcu=attiny44:crttn44.o%s} \
-+%{mmcu=attiny44a:crttn44a.o%s} \
- %{mmcu=attiny84:crttn84.o%s} \
-+%{mmcu=attiny84a:crttn84a.o%s} \
- %{mmcu=attiny25:crttn25.o%s} \
- %{mmcu=attiny45:crttn45.o%s} \
- %{mmcu=attiny85:crttn85.o%s} \
- %{mmcu=attiny261:crttn261.o%s} \
-+%{mmcu=attiny261a:crttn261a.o%s} \
- %{mmcu=attiny461:crttn461.o%s} \
-+%{mmcu=attiny461a:crttn461a.o%s} \
- %{mmcu=attiny861:crttn861.o%s} \
-+%{mmcu=attiny861a:crttn861a.o%s} \
- %{mmcu=attiny43u:crttn43u.o%s} \
- %{mmcu=attiny87:crttn87.o%s} \
- %{mmcu=attiny48:crttn48.o%s} \
-@@ -995,17 +1100,20 @@ mmcu=*:-mmcu=%*}"
- %{mmcu=at43usb320:crt43320.o%s} \
- %{mmcu=at90usb162|mmcu=avr35:crtusb162.o%s} \
- %{mmcu=at90usb82:crtusb82.o%s} \
-+%{mmcu=atmega8u2:crtm8u2.o%s} \
-+%{mmcu=atmega16u2:crtm16u2.o%s} \
-+%{mmcu=atmega32u2:crtm32u2.o%s} \
- %{mmcu=attiny167:crttn167.o%s} \
--%{mmcu=attiny327:crttn327.o%s} \
- %{mmcu=atmega8|mmcu=avr4:crtm8.o%s} \
- %{mmcu=atmega48:crtm48.o%s} \
-+%{mmcu=atmega48a:crtm48a.o%s} \
- %{mmcu=atmega48p:crtm48p.o%s} \
- %{mmcu=atmega88:crtm88.o%s} \
-+%{mmcu=atmega88a:crtm88a.o%s} \
- %{mmcu=atmega88p:crtm88p.o%s} \
-+%{mmcu=atmega88pa:crtm88pa.o%s} \
- %{mmcu=atmega8515:crtm8515.o%s} \
- %{mmcu=atmega8535:crtm8535.o%s} \
--%{mmcu=atmega8c1:crtm8c1.o%s} \
--%{mmcu=atmega8m1:crtm8m1.o%s} \
- %{mmcu=at90pwm1:crt90pwm1.o%s} \
- %{mmcu=at90pwm2:crt90pwm2.o%s} \
- %{mmcu=at90pwm2b:crt90pwm2b.o%s} \
-@@ -1013,48 +1121,70 @@ mmcu=*:-mmcu=%*}"
- %{mmcu=at90pwm3b:crt90pwm3b.o%s} \
- %{mmcu=at90pwm81:crt90pwm81.o%s} \
- %{mmcu=atmega16:crtm16.o%s} \
-+%{mmcu=atmega16a:crtm16a.o%s} \
- %{mmcu=atmega161|mmcu=avr5:crtm161.o%s} \
- %{mmcu=atmega162:crtm162.o%s} \
- %{mmcu=atmega163:crtm163.o%s} \
-+%{mmcu=atmega164a:crtm164a.o%s} \
- %{mmcu=atmega164p:crtm164p.o%s} \
- %{mmcu=atmega165:crtm165.o%s} \
-+%{mmcu=atmega165a:crtm165a.o%s} \
- %{mmcu=atmega165p:crtm165p.o%s} \
- %{mmcu=atmega168:crtm168.o%s} \
-+%{mmcu=atmega168a:crtm168a.o%s} \
- %{mmcu=atmega168p:crtm168p.o%s} \
- %{mmcu=atmega169:crtm169.o%s} \
-+%{mmcu=atmega169a:crtm169a.o%s} \
- %{mmcu=atmega169p:crtm169p.o%s} \
-+%{mmcu=atmega169pa:crtm169pa.o%s} \
- %{mmcu=atmega32:crtm32.o%s} \
- %{mmcu=atmega323:crtm323.o%s} \
-+%{mmcu=atmega324a:crtm324a.o%s} \
- %{mmcu=atmega324p:crtm324p.o%s} \
-+%{mmcu=atmega324pa:crtm324pa.o%s} \
- %{mmcu=atmega325:crtm325.o%s} \
-+%{mmcu=atmega325a:crtm325a.o%s} \
- %{mmcu=atmega325p:crtm325p.o%s} \
- %{mmcu=atmega3250:crtm3250.o%s} \
-+%{mmcu=atmega3250a:crtm3250a.o%s} \
- %{mmcu=atmega3250p:crtm3250p.o%s} \
-+%{mmcu=atmega328:crtm328.o%s} \
- %{mmcu=atmega328p:crtm328p.o%s} \
- %{mmcu=atmega329:crtm329.o%s} \
-+%{mmcu=atmega329a:crtm329a.o%s} \
- %{mmcu=atmega329p:crtm329p.o%s} \
-+%{mmcu=atmega329pa:crtm329pa.o%s} \
- %{mmcu=atmega3290:crtm3290.o%s} \
-+%{mmcu=atmega3290a:crtm3290a.o%s} \
- %{mmcu=atmega3290p:crtm3290p.o%s} \
- %{mmcu=atmega406:crtm406.o%s} \
- %{mmcu=atmega64:crtm64.o%s} \
- %{mmcu=atmega640:crtm640.o%s} \
- %{mmcu=atmega644:crtm644.o%s} \
-+%{mmcu=atmega644a:crtm644a.o%s} \
- %{mmcu=atmega644p:crtm644p.o%s} \
-+%{mmcu=atmega644pa:crtm644pa.o%s} \
- %{mmcu=atmega645:crtm645.o%s} \
-+%{mmcu=atmega645a:crtm645a.o%s} \
-+%{mmcu=atmega645p:crtm645p.o%s} \
- %{mmcu=atmega6450:crtm6450.o%s} \
-+%{mmcu=atmega6450a:crtm6450a.o%s} \
-+%{mmcu=atmega6450p:crtm6450p.o%s} \
- %{mmcu=atmega649:crtm649.o%s} \
-+%{mmcu=atmega649a:crtm649a.o%s} \
- %{mmcu=atmega6490:crtm6490.o%s} \
-+%{mmcu=atmega6490a:crtm6490a.o%s} \
-+%{mmcu=atmega6490p:crtm6490p.o%s} \
-+%{mmcu=atmega64hve:crtm64hve.o%s} \
- %{mmcu=atmega8hva:crtm8hva.o%s} \
- %{mmcu=atmega16hva:crtm16hva.o%s} \
-+%{mmcu=atmega16hva2:crtm16hva2.o%s} \
- %{mmcu=atmega16hvb:crtm16hvb.o%s} \
- %{mmcu=atmega32hvb:crtm32hvb.o%s} \
--%{mmcu=atmega4hvd:crtm4hvd.o%s} \
--%{mmcu=atmega8hvd:crtm8hvd.o%s} \
- %{mmcu=at90can32:crtcan32.o%s} \
- %{mmcu=at90can64:crtcan64.o%s} \
- %{mmcu=at90pwm216:crt90pwm216.o%s} \
- %{mmcu=at90pwm316:crt90pwm316.o%s} \
--%{mmcu=atmega16c1:crtm16c1.o%s} \
- %{mmcu=atmega32c1:crtm32c1.o%s} \
- %{mmcu=atmega64c1:crtm64c1.o%s} \
- %{mmcu=atmega16m1:crtm16m1.o%s} \
-@@ -1075,9 +1205,7 @@ mmcu=*:-mmcu=%*}"
- %{mmcu=atmega128rfa1:crtm128rfa1.o%s} \
- %{mmcu=at90usb1286:crtusb1286.o%s} \
- %{mmcu=at90usb1287:crtusb1287.o%s} \
--%{mmcu=m3000f:crtm3000f.o%s} \
--%{mmcu=m3000s:crtm3000s.o%s} \
--%{mmcu=m3001b:crtm3001b.o%s} \
-+%{mmcu=m3000:crtm3000.o%s} \
- %{mmcu=atmega2560|mmcu=avr6:crtm2560.o%s} \
- %{mmcu=atmega2561:crtm2561.o%s} \
- %{mmcu=avrxmega2|mmcu=atxmega32d4:crtx32d4.o%s} \
-diff --git a/gcc/config/avr/t-avr b/gcc/config/avr/t-avr
-index d375daf..af9e1de 100644
---- a/gcc/config/avr/t-avr
-+++ b/gcc/config/avr/t-avr
-@@ -82,16 +82,28 @@ MULTILIB_MATCHES = \
- mmcu?avr25=mmcu?attiny13 \
- mmcu?avr25=mmcu?attiny13a \
- mmcu?avr25=mmcu?attiny2313 \
-+ mmcu?avr25=mmcu?attiny2313a \
- mmcu?avr25=mmcu?attiny24 \
-+ mmcu?avr25=mmcu?attiny24a \
- mmcu?avr25=mmcu?attiny44 \
-+ mmcu?avr25=mmcu?attiny44a \
-+ mmcu?avr25=mmcu?attiny45 \
- mmcu?avr25=mmcu?attiny84 \
-+ mmcu?avr25=mmcu?attiny84a \
- mmcu?avr25=mmcu?attiny25 \
- mmcu?avr25=mmcu?attiny45 \
- mmcu?avr25=mmcu?attiny85 \
- mmcu?avr25=mmcu?attiny261 \
-+ mmcu?avr25=mmcu?attiny261a \
-+ mmcu?avr25=mmcu?attiny4313 \
- mmcu?avr25=mmcu?attiny461 \
-+ mmcu?avr25=mmcu?attiny461a \
- mmcu?avr25=mmcu?attiny861 \
- mmcu?avr25=mmcu?attiny43u \
-+ mmcu?avr25=mmcu?attiny84 \
-+ mmcu?avr25=mmcu?attiny85 \
-+ mmcu?avr25=mmcu?attiny861 \
-+ mmcu?avr25=mmcu?attiny861a \
- mmcu?avr25=mmcu?attiny87 \
- mmcu?avr25=mmcu?attiny48 \
- mmcu?avr25=mmcu?attiny88 \
-@@ -102,20 +114,21 @@ MULTILIB_MATCHES = \
- mmcu?avr31=mmcu?at43usb320 \
- mmcu?avr35=mmcu?at90usb82 \
- mmcu?avr35=mmcu?at90usb162 \
-+ mmcu?avr35=mmcu?atmega8u2 \
-+ mmcu?avr35=mmcu?atmega16u2 \
-+ mmcu?avr35=mmcu?atmega32u2 \
- mmcu?avr35=mmcu?attiny167 \
-- mmcu?avr35=mmcu?attiny327 \
- mmcu?avr4=mmcu?atmega48 \
-+ mmcu?avr4=mmcu?atmega48a \
- mmcu?avr4=mmcu?atmega48p \
- mmcu?avr4=mmcu?atmega8 \
- mmcu?avr4=mmcu?atmega8515 \
- mmcu?avr4=mmcu?atmega8535 \
- mmcu?avr4=mmcu?atmega88 \
-+ mmcu?avr4=mmcu?atmega88a \
- mmcu?avr4=mmcu?atmega88p \
-+ mmcu?avr4=mmcu?atmega88pa \
- mmcu?avr4=mmcu?atmega8hva \
-- mmcu?avr4=mmcu?atmega4hvd \
-- mmcu?avr4=mmcu?atmega8hvd \
-- mmcu?avr4=mmcu?atmega8c1 \
-- mmcu?avr4=mmcu?atmega8m1 \
- mmcu?avr4=mmcu?at90pwm1 \
- mmcu?avr4=mmcu?at90pwm2 \
- mmcu?avr4=mmcu?at90pwm2b \
-@@ -123,45 +136,69 @@ MULTILIB_MATCHES = \
- mmcu?avr4=mmcu?at90pwm3b \
- mmcu?avr4=mmcu?at90pwm81 \
- mmcu?avr5=mmcu?atmega16 \
-+ mmcu?avr5=mmcu?atmega16a \
- mmcu?avr5=mmcu?atmega161 \
- mmcu?avr5=mmcu?atmega162 \
- mmcu?avr5=mmcu?atmega163 \
-+ mmcu?avr5=mmcu?atmega164a \
- mmcu?avr5=mmcu?atmega164p \
- mmcu?avr5=mmcu?atmega165 \
-+ mmcu?avr5=mmcu?atmega165a \
- mmcu?avr5=mmcu?atmega165p \
- mmcu?avr5=mmcu?atmega168 \
-+ mmcu?avr5=mmcu?atmega168a \
- mmcu?avr5=mmcu?atmega168p \
- mmcu?avr5=mmcu?atmega169 \
-+ mmcu?avr5=mmcu?atmega169a \
- mmcu?avr5=mmcu?atmega169p \
-+ mmcu?avr5=mmcu?atmega169pa \
- mmcu?avr5=mmcu?atmega32 \
- mmcu?avr5=mmcu?atmega323 \
-+ mmcu?avr5=mmcu?atmega324a \
- mmcu?avr5=mmcu?atmega324p \
-+ mmcu?avr5=mmcu?atmega324pa \
- mmcu?avr5=mmcu?atmega325 \
-+ mmcu?avr5=mmcu?atmega325a \
- mmcu?avr5=mmcu?atmega325p \
- mmcu?avr5=mmcu?atmega3250 \
-+ mmcu?avr5=mmcu?atmega3250a \
- mmcu?avr5=mmcu?atmega3250p \
-+ mmcu?avr5=mmcu?atmega328 \
- mmcu?avr5=mmcu?atmega328p \
- mmcu?avr5=mmcu?atmega329 \
-+ mmcu?avr5=mmcu?atmega329a \
- mmcu?avr5=mmcu?atmega329p \
-+ mmcu?avr5=mmcu?atmega329pa \
- mmcu?avr5=mmcu?atmega3290 \
-+ mmcu?avr5=mmcu?atmega3290a \
- mmcu?avr5=mmcu?atmega3290p \
- mmcu?avr5=mmcu?atmega406 \
- mmcu?avr5=mmcu?atmega64 \
- mmcu?avr5=mmcu?atmega640 \
- mmcu?avr5=mmcu?atmega644 \
-+ mmcu?avr5=mmcu?atmega644a \
- mmcu?avr5=mmcu?atmega644p \
-+ mmcu?avr5=mmcu?atmega644pa \
- mmcu?avr5=mmcu?atmega645 \
-+ mmcu?avr5=mmcu?atmega645a \
-+ mmcu?avr5=mmcu?atmega645p \
- mmcu?avr5=mmcu?atmega6450 \
-+ mmcu?avr5=mmcu?atmega6450a \
-+ mmcu?avr5=mmcu?atmega6450p \
- mmcu?avr5=mmcu?atmega649 \
-+ mmcu?avr5=mmcu?atmega649a \
-+ mmcu?avr5=mmcu?atmega649p \
- mmcu?avr5=mmcu?atmega6490 \
-+ mmcu?avr5=mmcu?atmega6490a \
-+ mmcu?avr5=mmcu?atmega6490p \
- mmcu?avr5=mmcu?atmega16hva \
-+ mmcu?avr5=mmcu?atmega16hva2 \
- mmcu?avr5=mmcu?atmega16hvb \
- mmcu?avr5=mmcu?atmega32hvb \
- mmcu?avr5=mmcu?at90can32 \
- mmcu?avr5=mmcu?at90can64 \
- mmcu?avr5=mmcu?at90pwm216 \
- mmcu?avr5=mmcu?at90pwm316 \
-- mmcu?avr5=mmcu?atmega16c1 \
- mmcu?avr5=mmcu?atmega32c1 \
- mmcu?avr5=mmcu?atmega64c1 \
- mmcu?avr5=mmcu?atmega16m1 \
-@@ -170,6 +207,7 @@ MULTILIB_MATCHES = \
- mmcu?avr5=mmcu?atmega16u4 \
- mmcu?avr5=mmcu?atmega32u4 \
- mmcu?avr5=mmcu?atmega32u6 \
-+ mmcu?avr5=mmcu?atmega64hve \
- mmcu?avr5=mmcu?at90scr100 \
- mmcu?avr5=mmcu?at90usb646 \
- mmcu?avr5=mmcu?at90usb647 \
-@@ -182,10 +220,8 @@ MULTILIB_MATCHES = \
- mmcu?avr51=mmcu?at90can128 \
- mmcu?avr51=mmcu?at90usb1286 \
- mmcu?avr51=mmcu?at90usb1287 \
-- mmcu?avr51=mmcu?m3000f \
-- mmcu?avr51=mmcu?m3000s \
-- mmcu?avr51=mmcu?m3001b \
-- mmcu?avr6=mmcu?atmega2560 \
-+ mmcu?avr51=mmcu?m3000 \
-+ mmcu?avr6=mmcu?atmega2560 \
- mmcu?avr6=mmcu?atmega2561 \
- mmcu?avr6=mmcu?atmega2560 \
- mmcu?avr6=mmcu?atmega2561 \
---
-1.6.0.4
-