diff options
| author | Ralf Corsepius <ralf.corsepius@rtems.org> | 2008-02-11 17:43:40 +0000 |
|---|---|---|
| committer | Ralf Corsepius <ralf.corsepius@rtems.org> | 2008-02-11 17:43:40 +0000 |
| commit | acbb59054da8c7bf97c3807b54583fbe760270e5 (patch) | |
| tree | 2d0b2a4fc9f8bf2e7c0d1466882a67aae020c73d /contrib | |
| parent | 2008-02-08 Till Straumann <strauman@slac.stanford.edu> (diff) | |
| download | rtems-acbb59054da8c7bf97c3807b54583fbe760270e5.tar.bz2 | |
Add avr hacks for gcc-4.3
Diffstat (limited to 'contrib')
| -rw-r--r-- | contrib/crossrpms/patches/binutils-2.18-rtems4.9-20080211.diff | 68 |
1 files changed, 68 insertions, 0 deletions
diff --git a/contrib/crossrpms/patches/binutils-2.18-rtems4.9-20080211.diff b/contrib/crossrpms/patches/binutils-2.18-rtems4.9-20080211.diff new file mode 100644 index 0000000000..df54815012 --- /dev/null +++ b/contrib/crossrpms/patches/binutils-2.18-rtems4.9-20080211.diff @@ -0,0 +1,68 @@ +diff -uNr binutils-2.18.orig/configure binutils-2.18/configure +--- binutils-2.18.orig/configure 2007-08-06 22:29:40.000000000 +0200 ++++ binutils-2.18/configure 2008-02-11 17:43:28.000000000 +0100 +@@ -6128,7 +6128,7 @@ + # For an installed makeinfo, we require it to be from texinfo 4.4 or + # higher, else we use the "missing" dummy. + if ${MAKEINFO} --version \ +- | egrep 'texinfo[^0-9]*([1-3][0-9]|4\.[4-9]|[5-9])' >/dev/null 2>&1; then ++ | egrep 'texinfo[^0-9]*(4\.([4-9]|[1-9][0-9])|[5-9]|[1-9][0-9])' >/dev/null 2>&1; then + : + else + MAKEINFO="$MISSING makeinfo" +diff -uNr binutils-2.18.orig/configure.ac binutils-2.18/configure.ac +--- binutils-2.18.orig/configure.ac 2007-08-28 22:24:26.000000000 +0200 ++++ binutils-2.18/configure.ac 2008-02-11 17:43:28.000000000 +0100 +@@ -2403,7 +2403,7 @@ + # For an installed makeinfo, we require it to be from texinfo 4.4 or + # higher, else we use the "missing" dummy. + if ${MAKEINFO} --version \ +- | egrep 'texinfo[^0-9]*([1-3][0-9]|4\.[4-9]|[5-9])' >/dev/null 2>&1; then ++ | egrep 'texinfo[^0-9]*(4\.([4-9]|[1-9][0-9])|[5-9]|[1-9][0-9])' >/dev/null 2>&1; then + : + else + MAKEINFO="$MISSING makeinfo" +diff -uNr binutils-2.18.orig/gas/config/tc-avr.c binutils-2.18/gas/config/tc-avr.c +--- binutils-2.18.orig/gas/config/tc-avr.c 2007-08-06 21:59:55.000000000 +0200 ++++ binutils-2.18/gas/config/tc-avr.c 2008-02-11 17:43:13.000000000 +0100 +@@ -63,7 +63,7 @@ + { + {"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}, +@@ -102,6 +102,8 @@ + {"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}, + {"atmega8", AVR_ISA_M8, bfd_mach_avr4}, + {"atmega83", AVR_ISA_M8, bfd_mach_avr4}, /* XXX -> m8535 */ +@@ -150,8 +152,6 @@ + {"at90can32" , AVR_ISA_M323, bfd_mach_avr5}, + {"at90can64" , AVR_ISA_M323, bfd_mach_avr5}, + {"at90can128", AVR_ISA_M128, 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 -uNr binutils-2.18.orig/include/opcode/avr.h binutils-2.18/include/opcode/avr.h +--- binutils-2.18.orig/include/opcode/avr.h 2006-04-07 17:18:08.000000000 +0200 ++++ binutils-2.18/include/opcode/avr.h 2008-02-11 17:43:13.000000000 +0100 +@@ -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) |