1 files changed, 27 insertions, 14 deletions

diff --git a/devel/avr-gcc/files/patch-newdevices b/devel/avr-gcc/files/patch-newdevices
index b034533fb235..5ddb6a0c6c2d 100644
--- a/devel/avr-gcc/files/patch-newdevices
+++ b/devel/avr-gcc/files/patch-newdevices
@@ -1,6 +1,6 @@
-diff -ur ../gcc-3.4.5.orig/gcc/config/avr/avr.c ./gcc/config/avr/avr.c
---- ../gcc-3.4.5.orig/gcc/config/avr/avr.c	Wed Jan  4 22:38:40 2006
-+++ ./gcc/config/avr/avr.c	Wed Jan  4 22:44:07 2006
+diff -ur ../gcc-3.4.6.orig/gcc/config/avr/avr.c ./gcc/config/avr/avr.c
+--- ../gcc-3.4.6.orig/gcc/config/avr/avr.c	Sun Mar 20 22:14:28 2005
++++ ./gcc/config/avr/avr.c	Sun Mar 19 23:06:42 2006
 @@ -175,6 +175,18 @@
    { "at90c8534", 2, "__AVR_AT90C8534__" },
    { "at90s8535", 2, "__AVR_AT90S8535__" },
@@ -20,7 +20,7 @@ diff -ur ../gcc-3.4.5.orig/gcc/config/avr/avr.c ./gcc/config/avr/avr.c
      /* Classic, > 8K.  */
    { "avr3",      3, NULL },
    { "atmega103", 3, "__AVR_ATmega103__" },
-@@ -185,19 +197,42 @@
+@@ -185,19 +197,47 @@
      /* Enhanced, <= 8K.  */
    { "avr4",      4, NULL },
    { "atmega8",   4, "__AVR_ATmega8__" },
@@ -47,6 +47,7 @@ diff -ur ../gcc-3.4.5.orig/gcc/config/avr/avr.c ./gcc/config/avr/avr.c
 +  { "atmega3250", 5, "__AVR_ATmega3250__" },
 +  { "atmega329", 5, "__AVR_ATmega329__" },
 +  { "atmega3290", 5, "__AVR_ATmega3290__" },
++  { "atmega406", 5, "__AVR_ATmega406__" },
 +  { "atmega640", 5, "__AVR_ATmega640__" },
    { "atmega64",  5, "__AVR_ATmega64__" },
 +  { "atmega644", 5, "__AVR_ATmega644__" },
@@ -60,12 +61,16 @@ diff -ur ../gcc-3.4.5.orig/gcc/config/avr/avr.c ./gcc/config/avr/avr.c
 +  { "at90can32", 5, "__AVR_AT90CAN32__" },
 +  { "at90can64", 5, "__AVR_AT90CAN64__" },
 +  { "at90can128", 5, "__AVR_AT90CAN128__" },
++  { "at90usb646", 5, "__AVR_AT90USB646__" },
++  { "at90usb647", 5, "__AVR_AT90USB647__" },
++  { "at90usb1286", 5, "__AVR_AT90USB1286__" },
++  { "at90usb1287", 5, "__AVR_AT90USB1287__" },
    { "at94k",     5, "__AVR_AT94K__" },
      /* Assembler only.  */
    { "avr1",      1, NULL },
-diff -ur ../gcc-3.4.5.orig/gcc/config/avr/avr.h ./gcc/config/avr/avr.h
---- ../gcc-3.4.5.orig/gcc/config/avr/avr.h	Wed Jan  4 22:38:36 2006
-+++ ./gcc/config/avr/avr.h	Wed Jan  4 22:45:00 2006
+diff -ur ../gcc-3.4.6.orig/gcc/config/avr/avr.h ./gcc/config/avr/avr.h
+--- ../gcc-3.4.6.orig/gcc/config/avr/avr.h	Tue Mar  9 04:00:15 2004
++++ ./gcc/config/avr/avr.h	Sun Mar 19 23:08:23 2006
 @@ -2351,12 +2351,13 @@
     Do not define this macro if it does not need to do anything.  */
  
@@ -79,8 +84,8 @@ diff -ur ../gcc-3.4.5.orig/gcc/config/avr/avr.h ./gcc/config/avr/avr.h
 -%{mmcu=atmega16*|mmcu=atmega32*|mmcu=atmega64|mmcu=atmega128|mmcu=at94k:-m avr5}\
 -%{mmcu=atmega64|mmcu=atmega128|mmcu=atmega162|mmcu=atmega169: -Tdata 0x800100} "
 +%{mmcu=atmega8*|mmcu=atmega48|mmcu=at90pwm*:-m avr4}\
-+%{mmcu=atmega16*|mmcu=atmega32*|mmcu=atmega64*|mmcu=atmega128*|mmcu=at90can*|mmcu=at94k:-m avr5}\
-+%{mmcu=atmega324|mmcu=atmega325|mmcu=atmega3250|mmcu=atmega329|mmcu=atmega3290|mmcu=atmega48|mmcu=atmega88|mmcu=atmega64|mmcu=atmega644|mmcu=atmega645|mmcu=atmega6450|mmcu=atmega649|mmcu=atmega6490|mmcu=atmega128|mmcu=at90can*|mmcu=atmega162|mmcu=atmega164|mmcu=atmega165|mmcu=atmega168|mmcu=atmega169|mmcu=at90pwm*: -Tdata 0x800100}\
++%{mmcu=atmega16*|mmcu=atmega32*|mmcu=atmega406|mmcu=atmega64*|mmcu=atmega128*|mmcu=at90can*|mmcu=at90usb*|mmcu=at94k:-m avr5}\
++%{mmcu=atmega324|mmcu=atmega325|mmcu=atmega3250|mmcu=atmega329|mmcu=atmega3290|mmcu=atmega406|mmcu=atmega48|mmcu=atmega88|mmcu=atmega64|mmcu=atmega644|mmcu=atmega645|mmcu=atmega6450|mmcu=atmega649|mmcu=atmega6490|mmcu=atmega128|mmcu=at90can*|mmcu=atmega162|mmcu=atmega164|mmcu=atmega165|mmcu=atmega168|mmcu=atmega169|mmcu=at90pwm*|mmcu=at90usb*: -Tdata 0x800100}\
 +%{mmcu=atmega640|mmcu=atmega1280|mmcu=atmega1281: -Tdata 0x800200} "
  
  /* A C string constant that tells the GCC driver program options to
@@ -103,7 +108,7 @@ diff -ur ../gcc-3.4.5.orig/gcc/config/avr/avr.h ./gcc/config/avr/avr.h
  /* Another C string constant that tells the GCC driver program how
     and when to place a reference to `libgcc.a' into the linker
     command line.  This constant is placed both before and after the
-@@ -2421,23 +2422,57 @@
+@@ -2421,23 +2422,62 @@
  %{mmcu=at90c8534:crtc8534.o%s} \
  %{mmcu=at90s8535:crts8535.o%s} \
  %{mmcu=at86rf401:crt86401.o%s} \
@@ -145,6 +150,7 @@ diff -ur ../gcc-3.4.5.orig/gcc/config/avr/avr.h ./gcc/config/avr/avr.h
 +%{mmcu=atmega3250:crtm3250.o%s} \
 +%{mmcu=atmega329:crtm329.o%s} \
 +%{mmcu=atmega3290:crtm3290.o%s} \
++%{mmcu=atmega406:crtm406.o%s} \
  %{mmcu=atmega64:crtm64.o%s} \
 +%{mmcu=atmega640:crtm640.o%s} \
 +%{mmcu=atmega644:crtm644.o%s} \
@@ -158,13 +164,17 @@ diff -ur ../gcc-3.4.5.orig/gcc/config/avr/avr.h ./gcc/config/avr/avr.h
 +%{mmcu=at90can32:crtcan32.o%s} \
 +%{mmcu=at90can64:crtcan64.o%s} \
 +%{mmcu=at90can128:crtcan128.o%s} \
++%{mmcu=at90usb646:crtusb646.o%s} \
++%{mmcu=at90usb647:crtusb647.o%s} \
++%{mmcu=at90usb1286:crtusb1286.o%s} \
++%{mmcu=at90usb1287:crtusb1287.o%s} \
  %{mmcu=at94k:crtat94k.o%s}"
  
  #define EXTRA_SPECS {"crt_binutils", CRT_BINUTILS_SPECS},
-diff -ur ../gcc-3.4.5.orig/gcc/config/avr/t-avr ./gcc/config/avr/t-avr
---- ../gcc-3.4.5.orig/gcc/config/avr/t-avr	Mon Apr 25 06:17:34 2005
-+++ ./gcc/config/avr/t-avr	Wed Jan  4 22:43:26 2006
-@@ -46,12 +46,27 @@
+diff -ur ../gcc-3.4.6.orig/gcc/config/avr/t-avr ./gcc/config/avr/t-avr
+--- ../gcc-3.4.6.orig/gcc/config/avr/t-avr	Mon Apr 25 06:17:34 2005
++++ ./gcc/config/avr/t-avr	Sun Mar 19 23:08:56 2006
+@@ -46,12 +46,30 @@
  	mmcu?avr3=mmcu?at43usb320 mmcu?avr3=mmcu?at43usb355 \
  	mmcu?avr3=mmcu?at76c711 \
  	mmcu?avr4=mmcu?atmega8515 mmcu?avr4=mmcu?atmega8535 \
@@ -184,6 +194,7 @@ diff -ur ../gcc-3.4.5.orig/gcc/config/avr/t-avr ./gcc/config/avr/t-avr
 +	mmcu?avr5=mmcu?atmega325 mmcu?avr5=mmcu?atmega3250 \
 +	mmcu?avr5=mmcu?atmega329 mmcu?avr5=mmcu?atmega3290 \
 +	mmcu?avr5=mmcu?atmega32 \
++	mmcu?avr5=mmcu?atmega406 \
 +	mmcu?avr5=mmcu?atmega640 \
 +	mmcu?avr5=mmcu?atmega644 mmcu?avr5=mmcu?atmega645 \
 +	mmcu?avr5=mmcu?atmega6450 mmcu?avr5=mmcu?atmega649 \
@@ -193,6 +204,8 @@ diff -ur ../gcc-3.4.5.orig/gcc/config/avr/t-avr ./gcc/config/avr/t-avr
 +	mmcu?avr5=mmcu?at90can32 \
 +	mmcu?avr5=mmcu?at90can64 \
 +	mmcu?avr5=mmcu?at90can128 \
++	mmcu?avr5=mmcu?at90usb646 mmcu?avr5=mmcu?at90usb647 \
++	mmcu?avr5=mmcu?at90usb1286 mmcu?avr5=mmcu?at90usb1287 \
  	mmcu?avr5=mmcu?at94k
  
  MULTILIB_EXCEPTIONS =