aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--gas/ChangeLog8
-rw-r--r--gas/config/tc-avr.c6
-rw-r--r--gas/doc/c-avr.texi7
-rw-r--r--include/ChangeLog5
-rw-r--r--include/opcode/avr.h4
5 files changed, 24 insertions, 6 deletions
diff --git a/gas/ChangeLog b/gas/ChangeLog
index afb4c45..9e16fc0 100644
--- a/gas/ChangeLog
+++ b/gas/ChangeLog
@@ -1,3 +1,11 @@
+2008-01-16 Eric B. Weddington <eric.weddington@atmel.com>
+
+ * config/tc-avr.c (mcu_types): Change opcode set for avr3,
+ at90usb82, at90usb162.
+ * doc/c-avr.texi: Change architecture grouping for at90usb82,
+ at90usb162.
+ These changes support the new avr35 architecture group in gcc.
+
2008-01-15 H.J. Lu <hongjiu.lu@intel.com>
* config/tc-i386.c (md_assemble): Also zap movzx and movsx
diff --git a/gas/config/tc-avr.c b/gas/config/tc-avr.c
index 461f11d..0beec90 100644
--- a/gas/config/tc-avr.c
+++ b/gas/config/tc-avr.c
@@ -63,7 +63,7 @@ static struct mcu_type_s mcu_types[] =
{
{"avr1", AVR_ISA_TINY1, bfd_mach_avr1},
{"avr2", AVR_ISA_TINY2, bfd_mach_avr2},
- {"avr3", AVR_ISA_M103, bfd_mach_avr3},
+ {"avr3", AVR_ISA_AVR3, bfd_mach_avr3},
{"avr4", AVR_ISA_M8, bfd_mach_avr4},
{"avr5", AVR_ISA_ALL, bfd_mach_avr5},
{"avr6", AVR_ISA_ALL, bfd_mach_avr6},
@@ -103,6 +103,8 @@ static struct mcu_type_s mcu_types[] =
{"at43usb320", AVR_ISA_M103, bfd_mach_avr3},
{"at43usb355", AVR_ISA_M603, bfd_mach_avr3},
{"at76c711", AVR_ISA_M603, bfd_mach_avr3},
+ {"at90usb82", AVR_ISA_USB162, bfd_mach_avr3},
+ {"at90usb162", AVR_ISA_USB162, bfd_mach_avr3},
{"atmega48", AVR_ISA_PWMx, bfd_mach_avr4},
{"atmega48p", AVR_ISA_PWMx, bfd_mach_avr4},
{"atmega8", AVR_ISA_M8, bfd_mach_avr4},
@@ -159,8 +161,6 @@ static struct mcu_type_s mcu_types[] =
{"at90can128", AVR_ISA_M128, bfd_mach_avr5},
{"at90pwm216", AVR_ISA_M323, bfd_mach_avr5},
{"at90pwm316", AVR_ISA_M323, bfd_mach_avr5},
- {"at90usb82", AVR_ISA_M323, bfd_mach_avr5},
- {"at90usb162", AVR_ISA_M323, bfd_mach_avr5},
{"at90usb646", AVR_ISA_M323, bfd_mach_avr5},
{"at90usb647", AVR_ISA_M323, bfd_mach_avr5},
{"at90usb1286",AVR_ISA_M128, bfd_mach_avr5},
diff --git a/gas/doc/c-avr.texi b/gas/doc/c-avr.texi
index 5f0b1e8..ccfdbe3 100644
--- a/gas/doc/c-avr.texi
+++ b/gas/doc/c-avr.texi
@@ -44,7 +44,8 @@ attiny261, attiny461, attiny861, attiny24, attiny44, attiny84, attiny25,
attiny45, attiny85, attiny43u, attiny48, attiny88).
Instruction set avr3 is for the classic AVR core with up to 128K program
-memory space (MCU types: atmega103, at43usb320, at43usb355, at76c711).
+memory space (MCU types: atmega103, at43usb320, at43usb355, at76c711,
+at90usb82, at90usb162).
Instruction set avr4 is for the enhanced AVR core with up to 8K program
memory space (MCU types: atmega48, atmega48p,atmega8, atmega88, atmega88p,
@@ -59,8 +60,8 @@ atmega328p, atmega329, atmega329p, atmega3250, atmega3250p, atmega3290,
atmega3290p, atmega32hvb, atmega406, atmega64, atmega640, atmega644, atmega644p,
atmega128, atmega1280, atmega1281, atmega1284p, atmega645, atmega649,
atmega6450, atmega6490, atmega16hva, at90can32, at90can64, at90can128,
-at90pwm216, at90pwm316,at90usb82, at90usb162, at90usb646, at90usb647,
-at90usb1286, at90usb1287, at94k).
+at90pwm216, at90pwm316, at90usb646, at90usb647, at90usb1286, at90usb1287,
+at94k).
Instruction set avr6 is for the enhanced AVR core with 256K program
memory space (MCU types: atmega2560, atmega2561).
diff --git a/include/ChangeLog b/include/ChangeLog
index c856121..98fea92 100644
--- a/include/ChangeLog
+++ b/include/ChangeLog
@@ -1,3 +1,8 @@
+2008-01-03 Eric B. Weddington <eric.weddington@atmel.com>
+
+ * opcode/avr.h (AVR_ISA_USB162): Add new opcode set.
+ (AVR_ISA_AVR3): Likewise.
+
2007-11-17 Thiemo Seufer <ths@mips.com>
* elf/mips.h (Tag_GNU_MIPS_ABI_FP): Mention -mips32r2 -mfp64 variant
diff --git a/include/opcode/avr.h b/include/opcode/avr.h
index 55bb161..50a41a0 100644
--- a/include/opcode/avr.h
+++ b/include/opcode/avr.h
@@ -40,6 +40,10 @@
AVR_ISA_LPMX | AVR_ISA_SPM)
#define AVR_ISA_M603 (AVR_ISA_2xxx | AVR_ISA_MEGA)
#define AVR_ISA_M103 (AVR_ISA_M603 | AVR_ISA_ELPM)
+#define AVR_ISA_USB162 (AVR_ISA_M603 | AVR_ISA_MOVW | \
+ AVR_ISA_LPMX | AVR_ISA_SPM)
+#define AVR_ISA_AVR3 (AVR_ISA_M603 | AVR_ISA_MOVW | \
+ AVR_ISA_LPMX | AVR_ISA_SPM | AVR_ISA_ELPM)
#define AVR_ISA_M161 (AVR_ISA_M603 | AVR_ISA_MUL | AVR_ISA_MOVW | \
AVR_ISA_LPMX | AVR_ISA_SPM)
#define AVR_ISA_94K (AVR_ISA_M603 | AVR_ISA_MUL | AVR_ISA_MOVW | AVR_ISA_LPMX)