From 708fa3b5dfda43ef0e39858b9a6bbdbaf3aa23c6 Mon Sep 17 00:00:00 2001 From: Anatoly Sokolov Date: Sat, 9 Aug 2008 23:58:25 +0400 Subject: avr.c (avr_mcu_types): Move the AT43USB320 device to avr31 architecture. * config/avr/avr.c (avr_mcu_types): Move the AT43USB320 device to avr31 architecture. * config/avr/avr.h (CRT_BINUTILS_SPECS): (Ditto.). * config/avr/t-avr (MULTILIB_MATCHES): (Ditto.). From-SVN: r138915 --- gcc/ChangeLog | 7 +++++++ gcc/config/avr/avr.c | 2 +- gcc/config/avr/avr.h | 4 ++-- gcc/config/avr/t-avr | 2 +- 4 files changed, 11 insertions(+), 4 deletions(-) (limited to 'gcc') diff --git a/gcc/ChangeLog b/gcc/ChangeLog index c6a2449..bb607a8 100644 --- a/gcc/ChangeLog +++ b/gcc/ChangeLog @@ -1,3 +1,10 @@ +2008-08-09 Anatoly Sokolov + + * config/avr/avr.c (avr_mcu_types): Move the AT43USB320 device to + avr31 architecture. + * config/avr/avr.h (CRT_BINUTILS_SPECS): (Ditto.). + * config/avr/t-avr (MULTILIB_MATCHES): (Ditto.). + 2008-08-09 Richard Sandiford * config.gcc (mips*-*-linux*, mips64*-*-linux*): Add diff --git a/gcc/config/avr/avr.c b/gcc/config/avr/avr.c index 1b1650f..5fbf571 100644 --- a/gcc/config/avr/avr.c +++ b/gcc/config/avr/avr.c @@ -192,12 +192,12 @@ static const struct mcu_type_s avr_mcu_types[] = { { "at86rf401", ARCH_AVR25, "__AVR_AT86RF401__" }, /* Classic, > 8K, <= 64K. */ { "avr3", ARCH_AVR3, NULL }, - { "at43usb320", ARCH_AVR3, "__AVR_AT43USB320__" }, { "at43usb355", ARCH_AVR3, "__AVR_AT43USB355__" }, { "at76c711", ARCH_AVR3, "__AVR_AT76C711__" }, /* Classic, == 128K. */ { "avr31", ARCH_AVR31, NULL }, { "atmega103", ARCH_AVR31, "__AVR_ATmega103__" }, + { "at43usb320", ARCH_AVR31, "__AVR_AT43USB320__" }, /* Classic + MOVW + JMP/CALL. */ { "avr35", ARCH_AVR35, NULL }, { "at90usb82", ARCH_AVR35, "__AVR_AT90USB82__" }, diff --git a/gcc/config/avr/avr.h b/gcc/config/avr/avr.h index 2b72112..6a27c3b 100644 --- a/gcc/config/avr/avr.h +++ b/gcc/config/avr/avr.h @@ -931,10 +931,10 @@ mmcu=*:-mmcu=%*}" %{mmcu=attiny48:crttn48.o%s} \ %{mmcu=attiny88:crttn88.o%s} \ %{mmcu=attiny167:crttn167.o%s} \ -%{mmcu=at43usb320|mmcu=avr3:crt43320.o%s} \ -%{mmcu=at43usb355:crt43355.o%s} \ +%{mmcu=at43usb355|mmcu=avr3:crt43355.o%s} \ %{mmcu=at76c711:crt76711.o%s} \ %{mmcu=atmega103|mmcu=avr31:crtm103.o%s} \ +%{mmcu=at43usb320:crt43320.o%s} \ %{mmcu=at90usb162|mmcu=avr35:crtusb162.o%s} \ %{mmcu=at90usb82:crtusb82.o%s} \ %{mmcu=atmega8|mmcu=avr4:crtm8.o%s} \ diff --git a/gcc/config/avr/t-avr b/gcc/config/avr/t-avr index e64152b..082da67 100644 --- a/gcc/config/avr/t-avr +++ b/gcc/config/avr/t-avr @@ -58,10 +58,10 @@ MULTILIB_MATCHES = \ mmcu?avr25=mmcu?attiny48 \ mmcu?avr25=mmcu?attiny88 \ mmcu?avr25=mmcu?at86rf401 \ - mmcu?avr3=mmcu?at43usb320 \ mmcu?avr3=mmcu?at43usb355 \ mmcu?avr3=mmcu?at76c711 \ mmcu?avr31=mmcu?atmega103 \ + mmcu?avr31=mmcu?at43usb320 \ mmcu?avr35=mmcu?at90usb82 \ mmcu?avr35=mmcu?at90usb162 \ mmcu?avr35=mmcu?attiny167 \ -- cgit v1.1