Remove individual patches for adding new AVR devices to the toolchain,

and combine them into a single unified patch, as only two files need
to be patched anyway.

This will extend support of avr-binutils (over stock binutils-2.16) to
the following AVR devices:

ATtiny25/45/85
AT90PWM2/3
ATmega164/324/644
ATmega329/3290/649/6490
ATmega640/1280/1281
This commit is contained in:
Joerg Wunsch 2005-07-30 20:08:03 +00:00
parent 1e587ee0c0
commit 8794eea9cd
Notes: svn2git 2021-03-31 03:12:20 +00:00
svn path=/head/; revision=140491
3 changed files with 59 additions and 11 deletions

View file

@ -7,7 +7,7 @@
PORTNAME= binutils
PORTVERSION= 2.16
PORTREVISION= 1
PORTREVISION= 2
CATEGORIES= devel
MASTER_SITES= ${MASTER_SITE_SOURCEWARE}
MASTER_SITE_SUBDIR= binutils/releases

View file

@ -1,10 +0,0 @@
--- gas/config/tc-avr.c.orig Wed Feb 23 13:28:04 2005
+++ gas/config/tc-avr.c Thu Jun 30 23:39:09 2005
@@ -113,6 +113,7 @@
{"atmega3250",AVR_ISA_M323, bfd_mach_avr5},
{"atmega64", AVR_ISA_M323, bfd_mach_avr5},
{"atmega128", AVR_ISA_M128, bfd_mach_avr5},
+ {"atmega1280",AVR_ISA_M128, bfd_mach_avr5},
{"atmega645", AVR_ISA_M323, bfd_mach_avr5},
{"atmega6450",AVR_ISA_M323, bfd_mach_avr5},
{"at90can128",AVR_ISA_M128, bfd_mach_avr5},

View file

@ -0,0 +1,58 @@
diff -ru /tmp/binutils-orig/gas/config/tc-avr.c ./gas/config/tc-avr.c
--- /tmp/binutils-orig/gas/config/tc-avr.c Wed Feb 23 13:28:04 2005
+++ ./gas/config/tc-avr.c Sat Jul 30 21:43:34 2005
@@ -88,6 +88,9 @@
{"at86rf401", AVR_ISA_2xxx, bfd_mach_avr2},
{"attiny13", AVR_ISA_TINY2, bfd_mach_avr2},
{"attiny2313",AVR_ISA_TINY2, bfd_mach_avr2},
+ {"attiny25", AVR_ISA_TINY2, bfd_mach_avr2},
+ {"attiny45", AVR_ISA_TINY2, bfd_mach_avr2},
+ {"attiny85", AVR_ISA_TINY2, bfd_mach_avr2},
{"atmega603", AVR_ISA_M603, bfd_mach_avr3}, /* XXX -> m103 */
{"atmega103", AVR_ISA_M103, bfd_mach_avr3},
{"at43usb320",AVR_ISA_M103, bfd_mach_avr3},
@@ -100,21 +103,33 @@
{"atmega88", AVR_ISA_M8, bfd_mach_avr4},
{"atmega8515",AVR_ISA_M8, bfd_mach_avr4},
{"atmega8535",AVR_ISA_M8, bfd_mach_avr4},
+ {"at90pwm2", AVR_ISA_PWMx, bfd_mach_avr4},
+ {"at90pwm3", AVR_ISA_PWMx, bfd_mach_avr4},
{"atmega16", AVR_ISA_M323, bfd_mach_avr5},
{"atmega161", AVR_ISA_M161, bfd_mach_avr5},
{"atmega162", AVR_ISA_M323, bfd_mach_avr5},
{"atmega163", AVR_ISA_M161, bfd_mach_avr5},
+ {"atmega164", AVR_ISA_M323, bfd_mach_avr5},
{"atmega165", AVR_ISA_M323, bfd_mach_avr5},
{"atmega168", AVR_ISA_M323, bfd_mach_avr5},
{"atmega169", AVR_ISA_M323, bfd_mach_avr5},
{"atmega32", AVR_ISA_M323, bfd_mach_avr5},
{"atmega323", AVR_ISA_M323, bfd_mach_avr5},
+ {"atmega324", AVR_ISA_M323, bfd_mach_avr5},
{"atmega325", AVR_ISA_M323, bfd_mach_avr5},
+ {"atmega329", AVR_ISA_M323, bfd_mach_avr5},
{"atmega3250",AVR_ISA_M323, bfd_mach_avr5},
+ {"atmega3290",AVR_ISA_M323, bfd_mach_avr5},
{"atmega64", AVR_ISA_M323, bfd_mach_avr5},
+ {"atmega640", AVR_ISA_M323, bfd_mach_avr5},
+ {"atmega644", AVR_ISA_M323, bfd_mach_avr5},
{"atmega128", AVR_ISA_M128, bfd_mach_avr5},
+ {"atmega1280",AVR_ISA_M128, bfd_mach_avr5},
+ {"atmega1281",AVR_ISA_M128, bfd_mach_avr5},
{"atmega645", AVR_ISA_M323, bfd_mach_avr5},
+ {"atmega649", AVR_ISA_M323, bfd_mach_avr5},
{"atmega6450",AVR_ISA_M323, bfd_mach_avr5},
+ {"atmega6490",AVR_ISA_M323, bfd_mach_avr5},
{"at90can128",AVR_ISA_M128, bfd_mach_avr5},
{"at94k", AVR_ISA_94K, bfd_mach_avr5},
{NULL, 0, 0}
diff -ru /tmp/binutils-orig/include/opcode/avr.h ./include/opcode/avr.h
--- /tmp/binutils-orig/include/opcode/avr.h Thu Mar 3 12:58:09 2005
+++ ./include/opcode/avr.h Sat Jul 30 21:36:59 2005
@@ -37,6 +37,7 @@
AVR_ISA_SPM | AVR_ISA_BRK)
#define AVR_ISA_M8 (AVR_ISA_2xxx | AVR_ISA_MUL | AVR_ISA_MOVW | \
AVR_ISA_LPMX | AVR_ISA_SPM)
+#define AVR_ISA_PWMx (AVR_ISA_M8 | AVR_ISA_BRK)
#define AVR_ISA_M603 (AVR_ISA_2xxx | AVR_ISA_MEGA)
#define AVR_ISA_M103 (AVR_ISA_M603 | AVR_ISA_ELPM)
#define AVR_ISA_M161 (AVR_ISA_M603 | AVR_ISA_MUL | AVR_ISA_MOVW | \