From 80df34ab9008b39d0d7a41a6ed2131365647ed44 Mon Sep 17 00:00:00 2001 From: aesok Date: Tue, 6 Mar 2007 20:06:58 +0000 Subject: [PATCH] 2006-02-24 Anatoly Sokolov * config/avr/avr.c (avr_mcu_types): Add support for ATmega325P, ATmega3250P, ATmega329P, ATmega3290P, AT90USB82 and AT90USB162 devices. * config/avr/avr.h (LINK_SPEC, CRT_BINUTILS_SPECS): (Ditto.). * config/avr/t-avr (MULTILIB_MATCHES): (Ditto.). git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@122635 138bc75d-0d04-0410-961f-82ee72b054a4 --- gcc/ChangeLog | 8 ++++++++ gcc/config/avr/avr.c | 6 ++++++ gcc/config/avr/avr.h | 14 ++++++++++---- gcc/config/avr/t-avr | 6 ++++++ 4 files changed, 30 insertions(+), 4 deletions(-) diff --git a/gcc/ChangeLog b/gcc/ChangeLog index 125b6ff..5786037 100644 --- a/gcc/ChangeLog +++ b/gcc/ChangeLog @@ -1,3 +1,11 @@ +2006-03-06 Anatoly Sokolov + + * config/avr/avr.c (avr_mcu_types): Add support for ATmega325P, + ATmega3250P, ATmega329P, ATmega3290P, AT90USB82 and AT90USB162 + devices. + * config/avr/avr.h (LINK_SPEC, CRT_BINUTILS_SPECS): (Ditto.). + * config/avr/t-avr (MULTILIB_MATCHES): (Ditto.). + 2007-03-06 Jan Hubicka * errors.h (warning, error, fatal, internal_error): Mark as cold. diff --git a/gcc/config/avr/avr.c b/gcc/config/avr/avr.c index efe7b86..436c570 100644 --- a/gcc/config/avr/avr.c +++ b/gcc/config/avr/avr.c @@ -208,6 +208,7 @@ static const struct mcu_type_s avr_mcu_types[] = { { "at90pwm1", 4, "__AVR_AT90PWM1__" }, { "at90pwm2", 4, "__AVR_AT90PWM2__" }, { "at90pwm3", 4, "__AVR_AT90PWM3__" }, + { "at90usb82", 5, "__AVR_AT90USB82__" }, /* Enhanced, > 8K. */ { "avr5", 5, NULL }, { "atmega16", 5, "__AVR_ATmega16__" }, @@ -224,9 +225,13 @@ static const struct mcu_type_s avr_mcu_types[] = { { "atmega323", 5, "__AVR_ATmega323__" }, { "atmega324p",5, "__AVR_ATmega324P__" }, { "atmega325", 5, "__AVR_ATmega325__" }, + { "atmega325p", 5, "__AVR_ATmega325P__" }, { "atmega3250", 5, "__AVR_ATmega3250__" }, + { "atmega3250p", 5, "__AVR_ATmega3250P__" }, { "atmega329", 5, "__AVR_ATmega329__" }, + { "atmega329p", 5, "__AVR_ATmega329P__" }, { "atmega3290", 5, "__AVR_ATmega3290__" }, + { "atmega3290p", 5, "__AVR_ATmega3290P__" }, { "atmega406", 5, "__AVR_ATmega406__" }, { "atmega64", 5, "__AVR_ATmega64__" }, { "atmega640", 5, "__AVR_ATmega640__" }, @@ -242,6 +247,7 @@ static const struct mcu_type_s avr_mcu_types[] = { { "at90can32", 5, "__AVR_AT90CAN32__" }, { "at90can64", 5, "__AVR_AT90CAN64__" }, { "at90can128", 5, "__AVR_AT90CAN128__" }, + { "at90usb162", 5, "__AVR_AT90USB162__" }, { "at90usb646", 5, "__AVR_AT90USB646__" }, { "at90usb647", 5, "__AVR_AT90USB647__" }, { "at90usb1286", 5, "__AVR_AT90USB1286__" }, diff --git a/gcc/config/avr/avr.h b/gcc/config/avr/avr.h index 0c8a800..fb003ce 100644 --- a/gcc/config/avr/avr.h +++ b/gcc/config/avr/avr.h @@ -769,10 +769,10 @@ mmcu=*:-mmcu=%*}" mmcu=at90usb*|\ mmcu=at94k:-m avr5}\ %{mmcu=atmega324*|\ - mmcu=atmega325|\ - mmcu=atmega3250|\ - mmcu=atmega329|\ - mmcu=atmega3290|\ + mmcu=atmega325*|\ + mmcu=atmega3250*|\ + mmcu=atmega329*|\ + mmcu=atmega3290*|\ mmcu=atmega406|\ mmcu=atmega48|\ mmcu=atmega88|\ @@ -865,9 +865,13 @@ mmcu=*:-mmcu=%*}" %{mmcu=atmega323:crtm323.o%s} \ %{mmcu=atmega324p:crtm324p.o%s} \ %{mmcu=atmega325:crtm325.o%s} \ +%{mmcu=atmega325p:crtm325p.o%s} \ %{mmcu=atmega3250:crtm3250.o%s} \ +%{mmcu=atmega3250p:crtm3250p.o%s} \ %{mmcu=atmega329:crtm329.o%s} \ +%{mmcu=atmega329p:crtm329p.o%s} \ %{mmcu=atmega3290:crtm3290.o%s} \ +%{mmcu=atmega3290p:crtm3290p.o%s} \ %{mmcu=atmega406:crtm406.o%s} \ %{mmcu=atmega64:crtm64.o%s} \ %{mmcu=atmega640:crtm640.o%s} \ @@ -883,6 +887,8 @@ mmcu=*:-mmcu=%*}" %{mmcu=at90can32:crtcan32.o%s} \ %{mmcu=at90can64:crtcan64.o%s} \ %{mmcu=at90can128:crtcan128.o%s} \ +%{mmcu=at90usb82:crtusb82.o%s} \ +%{mmcu=at90usb162:crtusb162.o%s} \ %{mmcu=at90usb646:crtusb646.o%s} \ %{mmcu=at90usb647:crtusb647.o%s} \ %{mmcu=at90usb1286:crtusb1286.o%s} \ diff --git a/gcc/config/avr/t-avr b/gcc/config/avr/t-avr index 09cdc0f..2afae426 100644 --- a/gcc/config/avr/t-avr +++ b/gcc/config/avr/t-avr @@ -67,6 +67,7 @@ MULTILIB_MATCHES = \ mmcu?avr4=mmcu?at90pwm1 \ mmcu?avr4=mmcu?at90pwm2 \ mmcu?avr4=mmcu?at90pwm3 \ + mmcu?avr4=mmcu?at90usb82 \ mmcu?avr5=mmcu?atmega16 \ mmcu?avr5=mmcu?atmega161 \ mmcu?avr5=mmcu?atmega162 \ @@ -81,9 +82,13 @@ MULTILIB_MATCHES = \ mmcu?avr5=mmcu?atmega323 \ mmcu?avr5=mmcu?atmega324p \ mmcu?avr5=mmcu?atmega325 \ + mmcu?avr5=mmcu?atmega325p \ mmcu?avr5=mmcu?atmega3250 \ + mmcu?avr5=mmcu?atmega3250p \ mmcu?avr5=mmcu?atmega329 \ + mmcu?avr5=mmcu?atmega329p \ mmcu?avr5=mmcu?atmega3290 \ + mmcu?avr5=mmcu?atmega3290p \ mmcu?avr5=mmcu?atmega406 \ mmcu?avr5=mmcu?atmega64 \ mmcu?avr5=mmcu?atmega640 \ @@ -99,6 +104,7 @@ MULTILIB_MATCHES = \ mmcu?avr5=mmcu?at90can32 \ mmcu?avr5=mmcu?at90can64 \ mmcu?avr5=mmcu?at90can128 \ + mmcu?avr5=mmcu?at90usb162 \ mmcu?avr5=mmcu?at90usb646 \ mmcu?avr5=mmcu?at90usb647 \ mmcu?avr5=mmcu?at90usb1286 \ -- 2.7.4