diff -Naur src/gcc/config/avr/avr.c src_/gcc/config/avr/avr.c
--- src/gcc/config/avr/avr.c	2007-07-09 16:06:10.000000000 +0200
+++ src_/gcc/config/avr/avr.c	2007-08-21 18:36:48.000000000 +0200
@@ -269,6 +269,8 @@
   { "at90usb647",   ARCH_AVR5, "__AVR_AT90USB647__" },
   { "at90usb1286",  ARCH_AVR5, "__AVR_AT90USB1286__" },
   { "at90usb1287",  ARCH_AVR5, "__AVR_AT90USB1287__" },
+  { "at90pwm216",   ARCH_AVR5, "__AVR_AT90PWM216__" },
+  { "at90pwm316",   ARCH_AVR5, "__AVR_AT90PWM316__" },
   { "at94k",        ARCH_AVR5, "__AVR_AT94K__" },
     /* Assembler only.  */
   { "avr1",         ARCH_AVR1, NULL },
diff -Naur src/gcc/config/avr/avr.h src_/gcc/config/avr/avr.h
--- src/gcc/config/avr/avr.h	2007-07-06 20:27:18.000000000 +0200
+++ src_/gcc/config/avr/avr.h	2007-08-21 18:34:40.000000000 +0200
@@ -762,7 +762,9 @@
   mmcu=at76*:-m avr3}\
 %{mmcu=atmega8*|\
   mmcu=atmega48|\
-  mmcu=at90pwm*:-m avr4}\
+  mmcu=at90pwm1|\
+  mmcu=at90pwm2|\
+  mmcu=at90pwm3:-m avr4}\
 %{mmcu=atmega16*|\
   mmcu=atmega32*|\
   mmcu=atmega406|\
@@ -770,6 +772,8 @@
   mmcu=atmega128*|\
   mmcu=at90can*|\
   mmcu=at90usb*|\
+  mmcu=at90pwm216|\
+  mmcu=at90pwm316|\
   mmcu=at94k:-m avr5}\
 %{mmcu=atmega324*|\
   mmcu=atmega325*|\
@@ -896,6 +900,8 @@
 %{mmcu=at90usb647:crtusb647.o%s} \
 %{mmcu=at90usb1286:crtusb1286.o%s} \
 %{mmcu=at90usb1287:crtusb1287.o%s} \
+%{mmcu=at90pwm216:crt90pwm216.o%s} \
+%{mmcu=at90pwm316:crt90pwm316.o%s} \
 %{mmcu=at94k:crtat94k.o%s}"
 
 #define EXTRA_SPECS {"crt_binutils", CRT_BINUTILS_SPECS},
--- src/gcc/config/avr/t-avr_orig	2007-08-22 11:34:56.000000000 +0200
+++ src/gcc/config/avr/t-avr	2007-08-22 11:36:05.000000000 +0200
@@ -111,7 +111,9 @@
 	mmcu?avr5=mmcu?at90usb647 \
 	mmcu?avr5=mmcu?at90usb1286 \
 	mmcu?avr5=mmcu?at90usb1287 \
-	mmcu?avr5=mmcu?at94k
+	mmcu?avr5=mmcu?at94k \
+	mmcu?avr5=mmcu?at90pwm216 \
+	mmcu?avr5=mmcu?at90pwm316 
 
 MULTILIB_EXCEPTIONS =