32 Remove: m3000f, m3000s, m3001b, atmega16c1, atmega4hvd, atmega8hvd, atmega8m1,
34 ===========================================================
35 diff -Naurp gas/config/tc-avr.c gas/config/tc-avr.c
36 --- gas/config/tc-avr.c 2011-01-12 14:20:58.000000000 -0600
37 +++ gas/config/tc-avr.c 2011-01-12 14:24:17.000000000 -0600
38 @@ -115,12 +115,14 @@ static struct mcu_type_s mcu_types[] =
39 {"attiny44", AVR_ISA_AVR25, bfd_mach_avr25},
40 {"attiny44a", AVR_ISA_AVR25, bfd_mach_avr25},
41 {"attiny84", AVR_ISA_AVR25, bfd_mach_avr25},
42 + {"attiny84a", AVR_ISA_AVR25, bfd_mach_avr25},
43 {"attiny25", AVR_ISA_AVR25, bfd_mach_avr25},
44 {"attiny45", AVR_ISA_AVR25, bfd_mach_avr25},
45 {"attiny85", AVR_ISA_AVR25, bfd_mach_avr25},
46 {"attiny261", AVR_ISA_AVR25, bfd_mach_avr25},
47 {"attiny261a", AVR_ISA_AVR25, bfd_mach_avr25},
48 {"attiny461", AVR_ISA_AVR25, bfd_mach_avr25},
49 + {"attiny461a", AVR_ISA_AVR25, bfd_mach_avr25},
50 {"attiny861", AVR_ISA_AVR25, bfd_mach_avr25},
51 {"attiny861a", AVR_ISA_AVR25, bfd_mach_avr25},
52 {"attiny87", AVR_ISA_AVR25, bfd_mach_avr25},
53 @@ -134,7 +136,6 @@ static struct mcu_type_s mcu_types[] =
54 {"atmega103", AVR_ISA_AVR31, bfd_mach_avr31},
55 {"at43usb320", AVR_ISA_AVR31, bfd_mach_avr31},
56 {"attiny167", AVR_ISA_AVR35, bfd_mach_avr35},
57 - {"attiny327", AVR_ISA_AVR35, bfd_mach_avr35},
58 {"at90usb82", AVR_ISA_AVR35, bfd_mach_avr35},
59 {"at90usb162", AVR_ISA_AVR35, bfd_mach_avr35},
60 {"atmega8u2", AVR_ISA_AVR35, bfd_mach_avr35},
61 @@ -142,16 +143,15 @@ static struct mcu_type_s mcu_types[] =
62 {"atmega32u2", AVR_ISA_AVR35, bfd_mach_avr35},
63 {"atmega8", AVR_ISA_M8, bfd_mach_avr4},
64 {"atmega48", AVR_ISA_AVR4, bfd_mach_avr4},
65 + {"atmega48a", AVR_ISA_AVR4, bfd_mach_avr4},
66 {"atmega48p", AVR_ISA_AVR4, bfd_mach_avr4},
67 {"atmega88", AVR_ISA_AVR4, bfd_mach_avr4},
68 + {"atmega88a", AVR_ISA_AVR4, bfd_mach_avr4},
69 {"atmega88p", AVR_ISA_AVR4, bfd_mach_avr4},
70 + {"atmega88pa", AVR_ISA_AVR4, bfd_mach_avr4},
71 {"atmega8515", AVR_ISA_M8, bfd_mach_avr4},
72 {"atmega8535", AVR_ISA_M8, bfd_mach_avr4},
73 {"atmega8hva", AVR_ISA_AVR4, bfd_mach_avr4},
74 - {"atmega4hvd", AVR_ISA_AVR4, bfd_mach_avr4},
75 - {"atmega8hvd", AVR_ISA_AVR4, bfd_mach_avr4},
76 - {"atmega8c1", AVR_ISA_AVR4, bfd_mach_avr4},
77 - {"atmega8m1", AVR_ISA_AVR4, bfd_mach_avr4},
78 {"at90pwm1", AVR_ISA_AVR4, bfd_mach_avr4},
79 {"at90pwm2", AVR_ISA_AVR4, bfd_mach_avr4},
80 {"at90pwm2b", AVR_ISA_AVR4, bfd_mach_avr4},
81 @@ -159,40 +159,64 @@ static struct mcu_type_s mcu_types[] =
82 {"at90pwm3b", AVR_ISA_AVR4, bfd_mach_avr4},
83 {"at90pwm81", AVR_ISA_AVR4, bfd_mach_avr4},
84 {"atmega16", AVR_ISA_AVR5, bfd_mach_avr5},
85 + {"atmega16a", AVR_ISA_AVR5, bfd_mach_avr5},
86 {"atmega161", AVR_ISA_M161, bfd_mach_avr5},
87 {"atmega162", AVR_ISA_AVR5, bfd_mach_avr5},
88 {"atmega163", AVR_ISA_M161, bfd_mach_avr5},
89 + {"atmega164a", AVR_ISA_AVR5, bfd_mach_avr5},
90 {"atmega164p", AVR_ISA_AVR5, bfd_mach_avr5},
91 {"atmega165", AVR_ISA_AVR5, bfd_mach_avr5},
92 + {"atmega165a", AVR_ISA_AVR5, bfd_mach_avr5},
93 {"atmega165p", AVR_ISA_AVR5, bfd_mach_avr5},
94 {"atmega168", AVR_ISA_AVR5, bfd_mach_avr5},
95 + {"atmega168a", AVR_ISA_AVR5, bfd_mach_avr5},
96 {"atmega168p", AVR_ISA_AVR5, bfd_mach_avr5},
97 {"atmega169", AVR_ISA_AVR5, bfd_mach_avr5},
98 + {"atmega169a", AVR_ISA_AVR5, bfd_mach_avr5},
99 {"atmega169p", AVR_ISA_AVR5, bfd_mach_avr5},
100 - {"atmega16c1", AVR_ISA_AVR5, bfd_mach_avr5},
101 + {"atmega169pa",AVR_ISA_AVR5, bfd_mach_avr5},
102 {"atmega32", AVR_ISA_AVR5, bfd_mach_avr5},
103 {"atmega323", AVR_ISA_AVR5, bfd_mach_avr5},
104 + {"atmega324a", AVR_ISA_AVR5, bfd_mach_avr5},
105 {"atmega324p", AVR_ISA_AVR5, bfd_mach_avr5},
106 + {"atmega324pa",AVR_ISA_AVR5, bfd_mach_avr5},
107 {"atmega325", AVR_ISA_AVR5, bfd_mach_avr5},
108 + {"atmega325a", AVR_ISA_AVR5, bfd_mach_avr5},
109 {"atmega325p", AVR_ISA_AVR5, bfd_mach_avr5},
110 {"atmega3250", AVR_ISA_AVR5, bfd_mach_avr5},
111 + {"atmega3250a",AVR_ISA_AVR5, bfd_mach_avr5},
112 {"atmega3250p",AVR_ISA_AVR5, bfd_mach_avr5},
113 + {"atmega328", AVR_ISA_AVR5, bfd_mach_avr5},
114 {"atmega328p", AVR_ISA_AVR5, bfd_mach_avr5},
115 {"atmega329", AVR_ISA_AVR5, bfd_mach_avr5},
116 + {"atmega329a", AVR_ISA_AVR5, bfd_mach_avr5},
117 {"atmega329p", AVR_ISA_AVR5, bfd_mach_avr5},
118 + {"atmega329pa",AVR_ISA_AVR5, bfd_mach_avr5},
119 {"atmega3290", AVR_ISA_AVR5, bfd_mach_avr5},
120 + {"atmega3290a",AVR_ISA_AVR5, bfd_mach_avr5},
121 {"atmega3290p",AVR_ISA_AVR5, bfd_mach_avr5},
122 {"atmega406", AVR_ISA_AVR5, bfd_mach_avr5},
123 {"atmega64", AVR_ISA_AVR5, bfd_mach_avr5},
124 {"atmega640", AVR_ISA_AVR5, bfd_mach_avr5},
125 {"atmega644", AVR_ISA_AVR5, bfd_mach_avr5},
126 + {"atmega644a", AVR_ISA_AVR5, bfd_mach_avr5},
127 {"atmega644p", AVR_ISA_AVR5, bfd_mach_avr5},
128 {"atmega644pa",AVR_ISA_AVR5, bfd_mach_avr5},
129 {"atmega645", AVR_ISA_AVR5, bfd_mach_avr5},
130 + {"atmega645a", AVR_ISA_AVR5, bfd_mach_avr5},
131 + {"atmega645p", AVR_ISA_AVR5, bfd_mach_avr5},
132 {"atmega649", AVR_ISA_AVR5, bfd_mach_avr5},
133 + {"atmega649p", AVR_ISA_AVR5, bfd_mach_avr5},
134 + {"atmega649a", AVR_ISA_AVR5, bfd_mach_avr5},
135 {"atmega6450", AVR_ISA_AVR5, bfd_mach_avr5},
136 + {"atmega6450a",AVR_ISA_AVR5, bfd_mach_avr5},
137 + {"atmega6450p",AVR_ISA_AVR5, bfd_mach_avr5},
138 {"atmega6490", AVR_ISA_AVR5, bfd_mach_avr5},
139 + {"atmega6490a",AVR_ISA_AVR5, bfd_mach_avr5},
140 + {"atmega6490p",AVR_ISA_AVR5, bfd_mach_avr5},
141 + {"atmega64hve",AVR_ISA_AVR5, bfd_mach_avr5},
142 {"atmega16hva",AVR_ISA_AVR5, bfd_mach_avr5},
143 + {"atmega16hva2",AVR_ISA_AVR5, bfd_mach_avr5},
144 {"atmega16hvb",AVR_ISA_AVR5, bfd_mach_avr5},
145 {"atmega32hvb",AVR_ISA_AVR5, bfd_mach_avr5},
146 {"at90can32" , AVR_ISA_AVR5, bfd_mach_avr5},
147 @@ -211,6 +235,7 @@ static struct mcu_type_s mcu_types[] =
148 {"at90usb647", AVR_ISA_AVR5, bfd_mach_avr5},
149 {"at90scr100", AVR_ISA_AVR5, bfd_mach_avr5},
150 {"at94k", AVR_ISA_94K, bfd_mach_avr5},
151 + {"m3000", AVR_ISA_AVR5, bfd_mach_avr5},
152 {"atmega128", AVR_ISA_AVR51, bfd_mach_avr51},
153 {"atmega1280", AVR_ISA_AVR51, bfd_mach_avr51},
154 {"atmega1281", AVR_ISA_AVR51, bfd_mach_avr51},
155 @@ -219,9 +244,6 @@ static struct mcu_type_s mcu_types[] =
156 {"at90can128", AVR_ISA_AVR51, bfd_mach_avr51},
157 {"at90usb1286",AVR_ISA_AVR51, bfd_mach_avr51},
158 {"at90usb1287",AVR_ISA_AVR51, bfd_mach_avr51},
159 - {"m3000f", AVR_ISA_AVR51, bfd_mach_avr51},
160 - {"m3000s", AVR_ISA_AVR51, bfd_mach_avr51},
161 - {"m3001b", AVR_ISA_AVR51, bfd_mach_avr51},
162 {"atmega2560", AVR_ISA_AVR6, bfd_mach_avr6},
163 {"atmega2561", AVR_ISA_AVR6, bfd_mach_avr6},
164 {"atxmega16a4", AVR_ISA_XMEGA, bfd_mach_avrxmega2},
165 diff -Naurp gas/doc/c-avr.texi gas/doc/c-avr.texi
166 --- gas/doc/c-avr.texi 2011-01-12 14:20:58.000000000 -0600
167 +++ gas/doc/c-avr.texi 2011-01-12 14:22:42.000000000 -0600
168 @@ -43,9 +43,10 @@ at90s8535).
170 Instruction set avr25 is for the classic AVR core with up to 8K program memory
171 space plus the MOVW instruction (MCU types: attiny13, attiny13a, attiny2313,
172 -attiny2313a, attiny24, attiny24a, attiny4313, attiny44, attiny44a, attiny84,
173 -attiny25, attiny45, attiny85, attiny261, attiny261a, attiny461, attiny861,
174 -attiny861a, attiny87, attiny43u, attiny48, attiny88, at86rf401, ata6289).
175 +attiny2313a, attiny24, attiny24a, attiny4313, attiny43u, attiny44, attiny44a,
176 +attiny84, attiny84a, attiny25, attiny45, attiny85, attiny261, attiny261a,
177 +attiny461, attiny461a, attiny861, attiny861a, attiny87, attiny43u, attiny48,
178 +attiny88, at86rf401, ata6289).
180 Instruction set avr3 is for the classic AVR core with up to 128K program
181 memory space (MCU types: at43usb355, at76c711).
182 @@ -54,28 +55,33 @@ Instruction set avr31 is for the classic
183 memory space (MCU types: atmega103, at43usb320).
185 Instruction set avr35 is for classic AVR core plus MOVW, CALL, and JMP
186 -instructions (MCU types: attiny167, attiny327, at90usb82, at90usb162, atmega8u2,
187 +instructions (MCU types: attiny167, at90usb82, at90usb162, atmega8u2,
188 atmega16u2, atmega32u2).
190 Instruction set avr4 is for the enhanced AVR core with up to 8K program
191 -memory space (MCU types: atmega48, atmega48p,atmega8, atmega88, atmega88p,
192 -atmega8515, atmega8535, atmega8hva, atmega4hvd, atmega8hvd, at90pwm1,
193 -at90pwm2, at90pwm2b, at90pwm3, at90pwm3b, at90pwm81, atmega8m1, atmega8c1).
194 +memory space (MCU types: atmega48, atmega48a, atmega48p,atmega8, atmega88,
195 +atmega88a, atmega88p, atmega88pa, atmega8515, atmega8535, atmega8hva,
196 +at90pwm1,at90pwm2, at90pwm2b, at90pwm3, at90pwm3b,
199 Instruction set avr5 is for the enhanced AVR core with up to 128K program
200 -memory space (MCU types: atmega16, atmega161, atmega162, atmega163, atmega164p,
201 -atmega165, atmega165p, atmega168, atmega168p, atmega169, atmega169p, atmega16c1,
202 -atmega32, atmega323, atmega324p, atmega325, atmega325p, atmega3250, atmega3250p,
203 -atmega328p, atmega329, atmega329p, atmega3290, atmega3290p, atmega406, atmega64,
204 -atmega640, atmega644, atmega644p, atmega644pa, atmega645, atmega6450, atmega649,
205 -atmega6490, atmega16hva, atmega16hvb, atmega32hvb, at90can32, at90can64,
206 -at90pwm216, at90pwm316, atmega32c1, atmega64c1, atmega16m1, atmega32m1,
207 -atmega64m1, atmega16u4, atmega32u4, atmega32u6, at90usb646, at90usb647, at94k,
209 +memory space (MCU types: atmega16, atmega16a, atmega161, atmega162, atmega163,
210 +atmega164a, atmega164p, atmega165, atmega165a, atmega165p, atmega168,
211 +atmega168a, atmega168p, atmega169, atmega169p, atmega169pa,
212 +atmega32, atmega323, atmega324a, atmega324p, atmega324pa, atmega325, atmega325a,
213 +atmega325p, atmega3250, atmega3250a, atmega3250p, atmega328, atmega328p,
214 +atmega329, atmega329a, atmega329p, atmega329pa, atmega3290, atmega3290a,
215 +atmega3290p, atmega406, atmega64, atmega640, atmega644, atmega644a, atmega644p,
216 +atmega644pa, atmega645, atmega645a, atmega645p, atmega6450, atmega6450a,
217 +atmega6450p, atmega649, atmega649a, atmega649p, atmega6490, atmega6490a,
218 +atmega6490p, atmega64hve, atmega16hva, atmega16hva2, atmega16hvb, atmega32hvb,
219 +at90can32, at90can64, at90pwm216, at90pwm316, atmega16u4, atmega32c1,
220 +atmega64c1, atmega64m1, atmega16m1, atmega32m1, atmega64m1, atmega16u4,
221 +atmega32u4, atmega32u6, at90usb646, at90usb647, at94k, at90scr100).
223 Instruction set avr51 is for the enhanced AVR core with exactly 128K program
224 memory space (MCU types: atmega128, atmega1280, atmega1281, atmega1284p,
225 -atmega128rfa1, at90can128, at90usb1286, at90usb1287, m3000f, m3000s, m3001b).
226 +atmega128rfa1, at90can128, at90usb1286, at90usb1287, m3000).
228 Instruction set avr6 is for the enhanced AVR core with a 3-byte PC (MCU types:
229 atmega2560, atmega2561).