--- gcc/config/avr/avr.c	2009-08-25 21:03:53.000000000 +0200
+++ gcc/config/avr__/avr.c	2010-02-18 07:48:16.969805018 +0100
@@ -205,6 +205,9 @@
   { "avr35",        ARCH_AVR35, NULL },
   { "at90usb82",    ARCH_AVR35, "__AVR_AT90USB82__" },
   { "at90usb162",   ARCH_AVR35, "__AVR_AT90USB162__" },
+  { "atmega8u2",    ARCH_AVR35, "__AVR_ATmega8U2__" },
+  { "atmega16u2",   ARCH_AVR35, "__AVR_ATmega16U2__" },
+  { "atmega32u2",   ARCH_AVR35, "__AVR_ATmega32U2__" },
   { "attiny167",    ARCH_AVR35, "__AVR_ATtiny167__" },
   { "attiny327",    ARCH_AVR35, "__AVR_ATtiny327__" },
     /* Enhanced, <= 8K.  */
--- gcc/config/avr/avr.h	2009-03-28 22:09:50.000000000 +0100
+++ gcc/config/avr__/avr.h	2010-02-18 07:48:16.921804849 +0100
@@ -836,6 +836,9 @@
   mmcu=at76*|\
   mmcu=at90usb82|\
   mmcu=at90usb162|\
+  mmcu=atmega8u2|\
+  mmcu=atmega16u2|\
+  mmcu=atmega32u2|\
   mmcu=attiny16*|\
   mmcu=attiny32*: -m avr3}\
 %{mmcu=atmega8*|\
@@ -965,6 +968,9 @@
 %{mmcu=atmega103|mmcu=avr31:crtm103.o%s} \
 %{mmcu=at43usb320:crt43320.o%s} \
 %{mmcu=at90usb162|mmcu=avr35:crtusb162.o%s} \
+%{mmcu=atmega8u2|mmcu=avr35:crtm8u2.o%s} \
+%{mmcu=atmega16u2|mmcu=avr35:crtm16u2.o%s} \
+%{mmcu=atmega32u2|mmcu=avr35:crtm32u2.o%s} \
 %{mmcu=at90usb82:crtusb82.o%s} \
 %{mmcu=attiny167:crttn167.o%s} \
 %{mmcu=attiny327:crttn327.o%s} \
--- gcc/config/avr/t-avr	2009-03-28 22:09:50.000000000 +0100
+++ gcc/config/avr__/t-avr	2010-02-18 07:48:16.909816384 +0100
@@ -67,6 +67,9 @@
 	mmcu?avr31=mmcu?at43usb320 \
 	mmcu?avr35=mmcu?at90usb82 \
 	mmcu?avr35=mmcu?at90usb162 \
+	mmcu?avr35=mmcu?atmega8u2 \
+	mmcu?avr35=mmcu?atmega16u2 \
+	mmcu?avr35=mmcu?atmega32u2 \
 	mmcu?avr35=mmcu?attiny167 \
 	mmcu?avr35=mmcu?attiny327 \
 	mmcu?avr4=mmcu?atmega48 \