From 5752f78f3b1bec3a399a7af454cbca3124cbf22d Mon Sep 17 00:00:00 2001 From: Senthil Kumar Selvaraj Date: Mon, 3 Mar 2014 16:04:47 +0000 Subject: [PATCH] avr-mcus.def: Remove atxmega16x1. * config/avr/avr-mcus.def: Remove atxmega16x1. * config/avr/avr-tables.opt: Regenerate. * config/avr/t-multilib: Regenerate. * doc/avr-mmcu.texi: Regenerate. From-SVN: r208281 --- gcc/ChangeLog | 7 +++ gcc/config/avr/avr-mcus.def | 1 - gcc/config/avr/avr-tables.opt | 115 +++++++++++++++++----------------- gcc/config/avr/t-multilib | 1 - gcc/doc/avr-mmcu.texi | 2 +- 5 files changed, 64 insertions(+), 62 deletions(-) diff --git a/gcc/ChangeLog b/gcc/ChangeLog index a1b4e547357..3a6b447e26f 100644 --- a/gcc/ChangeLog +++ b/gcc/ChangeLog @@ -1,3 +1,10 @@ +2014-03-03 Senthil Kumar Selvaraj + + * config/avr/avr-mcus.def: Remove atxmega16x1. + * config/avr/avr-tables.opt: Regenerate. + * config/avr/t-multilib: Regenerate. + * doc/avr-mmcu.texi: Regenerate. + 2014-03-03 Tobias Grosser Mircea Namolaru diff --git a/gcc/config/avr/avr-mcus.def b/gcc/config/avr/avr-mcus.def index affd9f3d5c0..d068f5e8017 100644 --- a/gcc/config/avr/avr-mcus.def +++ b/gcc/config/avr/avr-mcus.def @@ -260,7 +260,6 @@ AVR_MCU ("atmega2561", ARCH_AVR6, "__AVR_ATmega2561__", 0, 0, 0 AVR_MCU ("avrxmega2", ARCH_AVRXMEGA2, NULL, 0, 0, 0x2000, 1, "x32a4") AVR_MCU ("atxmega16a4", ARCH_AVRXMEGA2, "__AVR_ATxmega16A4__", 0, 0, 0x2000, 1, "x16a4") AVR_MCU ("atxmega16d4", ARCH_AVRXMEGA2, "__AVR_ATxmega16D4__", 0, 0, 0x2000, 1, "x16d4") -AVR_MCU ("atxmega16x1", ARCH_AVRXMEGA2, "__AVR_ATxmega16X1__", 0, 0, 0x2000, 1, "x16x1") AVR_MCU ("atxmega32a4", ARCH_AVRXMEGA2, "__AVR_ATxmega32A4__", 0, 0, 0x2000, 1, "x32a4") AVR_MCU ("atxmega32d4", ARCH_AVRXMEGA2, "__AVR_ATxmega32D4__", 0, 0, 0x2000, 1, "x32d4") AVR_MCU ("atxmega32x1", ARCH_AVRXMEGA2, "__AVR_ATxmega32X1__", 0, 0, 0x2000, 1, "x32x1") diff --git a/gcc/config/avr/avr-tables.opt b/gcc/config/avr/avr-tables.opt index 90de7e11aba..b5c6d829050 100644 --- a/gcc/config/avr/avr-tables.opt +++ b/gcc/config/avr/avr-tables.opt @@ -597,173 +597,170 @@ EnumValue Enum(avr_mcu) String(atxmega16d4) Value(190) EnumValue -Enum(avr_mcu) String(atxmega16x1) Value(191) +Enum(avr_mcu) String(atxmega32a4) Value(191) EnumValue -Enum(avr_mcu) String(atxmega32a4) Value(192) +Enum(avr_mcu) String(atxmega32d4) Value(192) EnumValue -Enum(avr_mcu) String(atxmega32d4) Value(193) +Enum(avr_mcu) String(atxmega32x1) Value(193) EnumValue -Enum(avr_mcu) String(atxmega32x1) Value(194) +Enum(avr_mcu) String(atmxt112sl) Value(194) EnumValue -Enum(avr_mcu) String(atmxt112sl) Value(195) +Enum(avr_mcu) String(atmxt224) Value(195) EnumValue -Enum(avr_mcu) String(atmxt224) Value(196) +Enum(avr_mcu) String(atmxt224e) Value(196) EnumValue -Enum(avr_mcu) String(atmxt224e) Value(197) +Enum(avr_mcu) String(atmxt336s) Value(197) EnumValue -Enum(avr_mcu) String(atmxt336s) Value(198) +Enum(avr_mcu) String(atxmega16a4u) Value(198) EnumValue -Enum(avr_mcu) String(atxmega16a4u) Value(199) +Enum(avr_mcu) String(atxmega16c4) Value(199) EnumValue -Enum(avr_mcu) String(atxmega16c4) Value(200) +Enum(avr_mcu) String(atxmega32a4u) Value(200) EnumValue -Enum(avr_mcu) String(atxmega32a4u) Value(201) +Enum(avr_mcu) String(atxmega32c4) Value(201) EnumValue -Enum(avr_mcu) String(atxmega32c4) Value(202) +Enum(avr_mcu) String(atxmega32e5) Value(202) EnumValue -Enum(avr_mcu) String(atxmega32e5) Value(203) +Enum(avr_mcu) String(avrxmega4) Value(203) EnumValue -Enum(avr_mcu) String(avrxmega4) Value(204) +Enum(avr_mcu) String(atxmega64a3) Value(204) EnumValue -Enum(avr_mcu) String(atxmega64a3) Value(205) +Enum(avr_mcu) String(atxmega64d3) Value(205) EnumValue -Enum(avr_mcu) String(atxmega64d3) Value(206) +Enum(avr_mcu) String(atxmega64a3u) Value(206) EnumValue -Enum(avr_mcu) String(atxmega64a3u) Value(207) +Enum(avr_mcu) String(atxmega64a4u) Value(207) EnumValue -Enum(avr_mcu) String(atxmega64a4u) Value(208) +Enum(avr_mcu) String(atxmega64b1) Value(208) EnumValue -Enum(avr_mcu) String(atxmega64b1) Value(209) +Enum(avr_mcu) String(atxmega64b3) Value(209) EnumValue -Enum(avr_mcu) String(atxmega64b3) Value(210) +Enum(avr_mcu) String(atxmega64c3) Value(210) EnumValue -Enum(avr_mcu) String(atxmega64c3) Value(211) +Enum(avr_mcu) String(atxmega64d4) Value(211) EnumValue -Enum(avr_mcu) String(atxmega64d4) Value(212) +Enum(avr_mcu) String(avrxmega5) Value(212) EnumValue -Enum(avr_mcu) String(avrxmega5) Value(213) +Enum(avr_mcu) String(atxmega64a1) Value(213) EnumValue -Enum(avr_mcu) String(atxmega64a1) Value(214) +Enum(avr_mcu) String(atxmega64a1u) Value(214) EnumValue -Enum(avr_mcu) String(atxmega64a1u) Value(215) +Enum(avr_mcu) String(avrxmega6) Value(215) EnumValue -Enum(avr_mcu) String(avrxmega6) Value(216) +Enum(avr_mcu) String(atxmega128a3) Value(216) EnumValue -Enum(avr_mcu) String(atxmega128a3) Value(217) +Enum(avr_mcu) String(atxmega128d3) Value(217) EnumValue -Enum(avr_mcu) String(atxmega128d3) Value(218) +Enum(avr_mcu) String(atxmega192a3) Value(218) EnumValue -Enum(avr_mcu) String(atxmega192a3) Value(219) +Enum(avr_mcu) String(atxmega192d3) Value(219) EnumValue -Enum(avr_mcu) String(atxmega192d3) Value(220) +Enum(avr_mcu) String(atxmega256a3) Value(220) EnumValue -Enum(avr_mcu) String(atxmega256a3) Value(221) +Enum(avr_mcu) String(atxmega256a3b) Value(221) EnumValue -Enum(avr_mcu) String(atxmega256a3b) Value(222) +Enum(avr_mcu) String(atxmega256a3bu) Value(222) EnumValue -Enum(avr_mcu) String(atxmega256a3bu) Value(223) +Enum(avr_mcu) String(atxmega256d3) Value(223) EnumValue -Enum(avr_mcu) String(atxmega256d3) Value(224) +Enum(avr_mcu) String(atxmega128a3u) Value(224) EnumValue -Enum(avr_mcu) String(atxmega128a3u) Value(225) +Enum(avr_mcu) String(atxmega128b1) Value(225) EnumValue -Enum(avr_mcu) String(atxmega128b1) Value(226) +Enum(avr_mcu) String(atxmega128b3) Value(226) EnumValue -Enum(avr_mcu) String(atxmega128b3) Value(227) +Enum(avr_mcu) String(atxmega128c3) Value(227) EnumValue -Enum(avr_mcu) String(atxmega128c3) Value(228) +Enum(avr_mcu) String(atxmega128d4) Value(228) EnumValue -Enum(avr_mcu) String(atxmega128d4) Value(229) +Enum(avr_mcu) String(atmxt540s) Value(229) EnumValue -Enum(avr_mcu) String(atmxt540s) Value(230) +Enum(avr_mcu) String(atmxt540sreva) Value(230) EnumValue -Enum(avr_mcu) String(atmxt540sreva) Value(231) +Enum(avr_mcu) String(atxmega192a3u) Value(231) EnumValue -Enum(avr_mcu) String(atxmega192a3u) Value(232) +Enum(avr_mcu) String(atxmega192c3) Value(232) EnumValue -Enum(avr_mcu) String(atxmega192c3) Value(233) +Enum(avr_mcu) String(atxmega256a3u) Value(233) EnumValue -Enum(avr_mcu) String(atxmega256a3u) Value(234) +Enum(avr_mcu) String(atxmega256c3) Value(234) EnumValue -Enum(avr_mcu) String(atxmega256c3) Value(235) +Enum(avr_mcu) String(atxmega384c3) Value(235) EnumValue -Enum(avr_mcu) String(atxmega384c3) Value(236) +Enum(avr_mcu) String(atxmega384d3) Value(236) EnumValue -Enum(avr_mcu) String(atxmega384d3) Value(237) +Enum(avr_mcu) String(avrxmega7) Value(237) EnumValue -Enum(avr_mcu) String(avrxmega7) Value(238) +Enum(avr_mcu) String(atxmega128a1) Value(238) EnumValue -Enum(avr_mcu) String(atxmega128a1) Value(239) +Enum(avr_mcu) String(atxmega128a1u) Value(239) EnumValue -Enum(avr_mcu) String(atxmega128a1u) Value(240) +Enum(avr_mcu) String(atxmega128a4u) Value(240) EnumValue -Enum(avr_mcu) String(atxmega128a4u) Value(241) +Enum(avr_mcu) String(avr1) Value(241) EnumValue -Enum(avr_mcu) String(avr1) Value(242) +Enum(avr_mcu) String(at90s1200) Value(242) EnumValue -Enum(avr_mcu) String(at90s1200) Value(243) +Enum(avr_mcu) String(attiny11) Value(243) EnumValue -Enum(avr_mcu) String(attiny11) Value(244) +Enum(avr_mcu) String(attiny12) Value(244) EnumValue -Enum(avr_mcu) String(attiny12) Value(245) +Enum(avr_mcu) String(attiny15) Value(245) EnumValue -Enum(avr_mcu) String(attiny15) Value(246) - -EnumValue -Enum(avr_mcu) String(attiny28) Value(247) +Enum(avr_mcu) String(attiny28) Value(246) diff --git a/gcc/config/avr/t-multilib b/gcc/config/avr/t-multilib index cc5e99e393f..301f86496cc 100644 --- a/gcc/config/avr/t-multilib +++ b/gcc/config/avr/t-multilib @@ -221,7 +221,6 @@ MULTILIB_MATCHES = \ mmcu?avr6=mmcu?atmega2561 \ mmcu?avrxmega2=mmcu?atxmega16a4 \ mmcu?avrxmega2=mmcu?atxmega16d4 \ - mmcu?avrxmega2=mmcu?atxmega16x1 \ mmcu?avrxmega2=mmcu?atxmega32a4 \ mmcu?avrxmega2=mmcu?atxmega32d4 \ mmcu?avrxmega2=mmcu?atxmega32x1 \ diff --git a/gcc/doc/avr-mmcu.texi b/gcc/doc/avr-mmcu.texi index cd167c5e389..175407b095c 100644 --- a/gcc/doc/avr-mmcu.texi +++ b/gcc/doc/avr-mmcu.texi @@ -50,7 +50,7 @@ @item avrxmega2 ``XMEGA'' devices with more than 8@tie{}KiB and up to 64@tie{}KiB of program memory. -@*@var{mcu}@tie{}= @code{atmxt112sl}, @code{atmxt224}, @code{atmxt224e}, @code{atmxt336s}, @code{atxmega16a4}, @code{atxmega16a4u}, @code{atxmega16c4}, @code{atxmega16d4}, @code{atxmega16x1}, @code{atxmega32a4}, @code{atxmega32a4u}, @code{atxmega32c4}, @code{atxmega32d4}, @code{atxmega32e5}, @code{atxmega32x1}. +@*@var{mcu}@tie{}= @code{atmxt112sl}, @code{atmxt224}, @code{atmxt224e}, @code{atmxt336s}, @code{atxmega16a4}, @code{atxmega16a4u}, @code{atxmega16c4}, @code{atxmega16d4}, @code{atxmega32a4}, @code{atxmega32a4u}, @code{atxmega32c4}, @code{atxmega32d4}, @code{atxmega32e5}, @code{atxmega32x1}. @item avrxmega4 ``XMEGA'' devices with more than 64@tie{}KiB and up to 128@tie{}KiB of program memory.