* config/avr/avr.c (avr_mcu_types): Update supported devices.

	* config/avr/avr.h (CPP_SPEC, LINK_SPEC, CRT_BINUTILS_SPECS): Likewise.
	* config/avr/t-avr (MULTILIB_MATCHES): Likewise.


git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@53381 138bc75d-0d04-0410-961f-82ee72b054a4

3 files changed, 29 insertions, 15 deletions

diff --git a/gcc/config/avr/avr.c b/gcc/config/avr/avr.c
index 40276622ab2..fe1674d2643 100644
--- a/gcc/config/avr/avr.c
+++ b/gcc/config/avr/avr.c
@@ -137,9 +137,10 @@ static const struct mcu_type_s avr_mcu_types[] = {
   { "avr2",      AVR2 },
   { "at90s2313", AVR2 },
   { "at90s2323", AVR2 },
-  { "attiny22",  AVR2 },
   { "at90s2333", AVR2 },
   { "at90s2343", AVR2 },
+  { "attiny22",  AVR2 },
+  { "attiny26",  AVR2 },
   { "at90s4414", AVR2 },
   { "at90s4433", AVR2 },
   { "at90s4434", AVR2 },
@@ -151,22 +152,24 @@ static const struct mcu_type_s avr_mcu_types[] = {
   { "atmega103", AVR3 },
   { "atmega603", AVR3 },
   { "at43usb320", AVR3 },
+  { "at43usb355", AVR3 },
   { "at76c711",  AVR3 },
     /* Enhanced, <= 8K.  */
   { "avr4",      AVR4 },
   { "atmega8",   AVR4 },
   { "atmega83",  AVR4 },
   { "atmega85",  AVR4 },
+  { "atmega8515", AVR4 },
     /* Enhanced, > 8K.  */
   { "avr5",      AVR5 },
   { "atmega16",  AVR5 },
   { "atmega161", AVR5 },
+  { "atmega162", AVR5 },
   { "atmega163", AVR5 },
   { "atmega32",  AVR5 },
   { "atmega323", AVR5 },
   { "atmega64",  AVR5 },
   { "atmega128", AVR5 },
-  { "at43usb355", AVR5 },
   { "at94k",     AVR5 },
     /* Assembler only.  */
   { "avr1",      AVR1 },
diff --git a/gcc/config/avr/avr.h b/gcc/config/avr/avr.h
index e11961ab5a1..949f45f8ded 100644
--- a/gcc/config/avr/avr.h
+++ b/gcc/config/avr/avr.h
@@ -2618,6 +2618,7 @@ extern int avr_case_values_threshold;
 %{mmcu=at90s2333:%(cpp_avr2) -D__AVR_AT90S2333__} \
 %{mmcu=at90s2343:%(cpp_avr2) -D__AVR_AT90S2343__} \
 %{mmcu=attiny22: %(cpp_avr2) -D__AVR_ATtiny22__} \
+%{mmcu=attiny26: %(cpp_avr2) -D__AVR_ATtiny26__} \
 %{mmcu=at90s4433:%(cpp_avr2) -D__AVR_AT90S4433__} \
 %{mmcu=at90s4414:%(cpp_avr2) -D__AVR_AT90S4414__} \
 %{mmcu=at90s4434:%(cpp_avr2) -D__AVR_AT90S4434__} \
@@ -2628,20 +2629,22 @@ extern int avr_case_values_threshold;
 %{mmcu=atmega603:%(cpp_avr3) -D__AVR_ATmega603__} \
 %{mmcu=atmega103:%(cpp_avr3) -D__AVR_ATmega103__} \
 %{mmcu=at43usb320:%(cpp_avr3) -D__AVR_AT43USB320__} \
+%{mmcu=at43usb355:%(cpp_avr3) -D__AVR_AT43USB355__} \
 %{mmcu=at76c711: %(cpp_avr3) -D__AVR_AT76C711__} \
 %{mmcu=avr4:%(cpp_avr4)} \
 %{mmcu=atmega8:  %(cpp_avr4) -D__AVR_ATmega8__} \
 %{mmcu=atmega83: %(cpp_avr4) -D__AVR_ATmega83__} \
 %{mmcu=atmega85: %(cpp_avr4) -D__AVR_ATmega85__} \
+%{mmcu=atmega8515: %(cpp_avr4) -D__AVR_ATmega8515__} \
 %{mmcu=avr5:%(cpp_avr5)} \
 %{mmcu=atmega16: %(cpp_avr5) -D__AVR_ATmega16__} \
 %{mmcu=atmega161:%(cpp_avr5) -D__AVR_ATmega161__} \
+%{mmcu=atmega162:%(cpp_avr5) -D__AVR_ATmega162__} \
 %{mmcu=atmega163:%(cpp_avr5) -D__AVR_ATmega163__} \
 %{mmcu=atmega32: %(cpp_avr5) -D__AVR_ATmega32__} \
 %{mmcu=atmega323:%(cpp_avr5) -D__AVR_ATmega323__} \
 %{mmcu=atmega64: %(cpp_avr5) -D__AVR_ATmega64__} \
 %{mmcu=atmega128:%(cpp_avr5) -D__AVR_ATmega128__} \
-%{mmcu=at43usb355:%(cpp_avr5) -D__AVR_AT43USB355__} \
 %{mmcu=at94k:    %(cpp_avr5) -D__AVR_AT94K__} \
 %{mmcu=avr1:%(cpp_avr1)} \
 %{mmcu=at90s1200:%(cpp_avr1) -D__AVR_AT90S1200__} \
@@ -2705,26 +2708,29 @@ extern int avr_case_values_threshold;
 %{mmcu=atmega603:-m avrmega603} \
 %{mmcu=atmega103:-m avrmega103} \
 %{mmcu=at43usb320:-m avr3} \
+%{mmcu=at43usb355:-m avr3} \
 %{mmcu=at76c711:-m avr3} \
 %{mmcu=atmega16:-m avrmega161} \
 %{mmcu=atmega161:-m avrmega161} \
+%{mmcu=atmega162:-m avr5 -Tdata 0x800100} \
 %{mmcu=atmega163:-m avrmega161} \
 %{mmcu=atmega32:-m avr5} \
 %{mmcu=atmega323:-m avr5} \
-%{mmcu=atmega64:-m avr5} \
-%{mmcu=atmega128:-m avr5} \
-%{mmcu=at43usb355:-m avr5} \
+%{mmcu=atmega64:-m avr5 -Tdata 0x800100} \
+%{mmcu=atmega128:-m avr5 -Tdata 0x800100} \
 %{mmcu=at94k:-m avr5} \
 %{mmcu=atmega8:-m avr4} \
 %{mmcu=atmega83:-m avr4} \
 %{mmcu=atmega85:-m avr4} \
+%{mmcu=atmega8515:-m avr4} \
 %{mmcu=at90s1200|mmcu=attiny1*:-m avr1200} \
 %{mmcu=attiny28:-m avr1} \
 %{mmcu=at90s2313:-m avr23xx} \
 %{mmcu=at90s2323:-m avr23xx} \
-%{mmcu=attiny22:-m avr23xx} \
 %{mmcu=at90s2333:-m avr23xx} \
 %{mmcu=at90s2343:-m avr23xx} \
+%{mmcu=attiny22:-m avr23xx} \
+%{mmcu=attiny26:-m avr23xx} \
 %{mmcu=at90s4433:-m avr4433} \
 %{mmcu=at90s4414:-m avr44x4} \
 %{mmcu=at90s4434:-m avr44x4} \
@@ -2782,9 +2788,10 @@ extern int avr_case_values_threshold;
 %{!mmcu*|mmcu=at90s8515|mmcu=avr2:crts8515.o%s} \
 %{mmcu=at90s2313:crts2313.o%s} \
 %{mmcu=at90s2323:crts2323.o%s} \
-%{mmcu=attiny22:crttn22.o%s} \
 %{mmcu=at90s2333:crts2333.o%s} \
 %{mmcu=at90s2343:crts2343.o%s} \
+%{mmcu=attiny22:crttn22.o%s} \
+%{mmcu=attiny26:crttn26.o%s} \
 %{mmcu=at90s4433:crts4433.o%s} \
 %{mmcu=at90s4414:crts4414.o%s} \
 %{mmcu=at90s4434:crts4434.o%s} \
@@ -2793,18 +2800,20 @@ extern int avr_case_values_threshold;
 %{mmcu=atmega103|mmcu=avr3:crtm103.o%s} \
 %{mmcu=atmega603:crtm603.o%s} \
 %{mmcu=at43usb320:crt43320.o%s} \
+%{mmcu=at43usb355:crt43355.o%s} \
 %{mmcu=at76c711:crt76711.o%s } \
 %{mmcu=atmega8:crtm8.o%s} \
 %{mmcu=atmega83|mmcu=avr4:crtm83.o%s} \
 %{mmcu=atmega85:crtm85.o%s} \
+%{mmcu=atmega8515:crtm8515.o%s} \
 %{mmcu=atmega16:crtm16.o%s} \
 %{mmcu=atmega161|mmcu=avr5:crtm161.o%s} \
+%{mmcu=atmega162:crtm162.o%s} \
 %{mmcu=atmega163:crtm163.o%s} \
 %{mmcu=atmega32:crtm32.o%s} \
 %{mmcu=atmega323:crtm323.o%s} \
 %{mmcu=atmega64:crtm64.o%s} \
 %{mmcu=atmega128:crtm128.o%s} \
-%{mmcu=at43usb355:crt43355.o%s} \
 %{mmcu=at94k:crtat94k.o%s}"
 
 #define CPP_AVR1_SPEC "-D__AVR_ARCH__=1 -D__AVR_ASM_ONLY__ "
diff --git a/gcc/config/avr/t-avr b/gcc/config/avr/t-avr
index 31f41df4109..68b04d66343 100644
--- a/gcc/config/avr/t-avr
+++ b/gcc/config/avr/t-avr
@@ -43,13 +43,15 @@ MULTILIB_DIRNAMES = avr2 avr3 avr4 avr5
 # The many avr2 matches are not listed here - this is the default.
 MULTILIB_MATCHES = \
 	mmcu?avr3=mmcu?atmega103 mmcu?avr3=mmcu?atmega603 \
-	mmcu?avr3=mmcu?at43usb320 mmcu?avr3=mmcu?at76c711 \
-	mmcu?avr4=mmcu?atmega83  mmcu?avr4=mmcu?atmega85  \
-	mmcu?avr4=mmcu?atmega8   mmcu?avr5=mmcu?atmega16  \
-	mmcu?avr5=mmcu?atmega161 mmcu?avr5=mmcu?atmega163 \
+	mmcu?avr3=mmcu?at43usb320 mmcu?avr3=at43usb355 \
+	mmcu?avr3=mmcu?at76c711 \
+	mmcu?avr4=mmcu?atmega8515 mmcu?avr4=mmcu?atmega83 \
+	mmcu?avr4=mmcu?atmega85  mmcu?avr4=mmcu?atmega8 \
+	mmcu?avr5=mmcu?atmega161 mmcu?avr5=mmcu?atmega162 \
+	mmcu?avr5=mmcu?atmega163 mmcu?avr5=mmcu?atmega16 \
+	mmcu?avr5=mmcu?atmega323 mmcu?avr5=mmcu?atmega32 \
 	mmcu?avr5=mmcu?atmega64  mmcu?avr5=mmcu?atmega128 \
-	mmcu?avr5=mmcu?at43usb355 mmcu?avr5=mmcu?atmega323 \
-	mmcu?avr5=mmcu?atmega32  mmcu?avr5=mmcu?at94k
+	mmcu?avr5=mmcu?at94k
 
 MULTILIB_EXCEPTIONS =