diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index ba5a9e0d2d0..098829cd96a 100644
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,3 +1,10 @@
+2006-09-02  Anatoly Sokolov <aesok@post.ru>
+
+        * config/avr/avr.c (avr_mcu_types): Add support for at90pwm1 device.
+        * config/avr/t-avr (MULTILIB_MATCHES): (Ditto.).
+        * config/avr/avr.h (LINK_SPEC, CRT_BINUTILS_SPECS): (Ditto.).
+        (avr_rtx_costs): Mark 'outer_code' argument with ATTRIBUTE_UNUSED.
+
 2006-09-05  Richard Guenther  <rguenther@suse.de>
 
 	PR tree-optimization/28900
diff --git a/gcc/config/avr/avr.c b/gcc/config/avr/avr.c
index 66ec146a36e..3e8f63385be 100644
--- a/gcc/config/avr/avr.c
+++ b/gcc/config/avr/avr.c
@@ -205,6 +205,7 @@ static const struct mcu_type_s avr_mcu_types[] = {
   { "atmega88",   4, "__AVR_ATmega88__" },
   { "atmega8515", 4, "__AVR_ATmega8515__" },
   { "atmega8535", 4, "__AVR_ATmega8535__" },
+  { "at90pwm1",  4, "__AVR_AT90PWM1__" },
   { "at90pwm2",  4, "__AVR_AT90PWM2__" },
   { "at90pwm3",  4, "__AVR_AT90PWM3__" },
     /* Enhanced, > 8K.  */
@@ -4948,7 +4949,7 @@ avr_operand_rtx_cost (rtx x, enum machine_mode mode, enum rtx_code outer)
    case, *TOTAL contains the cost result.  */
 
 static bool
-avr_rtx_costs (rtx x, int code, int outer_code, int *total)
+avr_rtx_costs (rtx x, int code, int outer_code ATTRIBUTE_UNUSED, int *total)
 {
   enum machine_mode mode = GET_MODE (x);
   HOST_WIDE_INT val;
diff --git a/gcc/config/avr/avr.h b/gcc/config/avr/avr.h
index 236dae79d6c..2285e57cf1f 100644
--- a/gcc/config/avr/avr.h
+++ b/gcc/config/avr/avr.h
@@ -753,6 +753,7 @@ mmcu=*:-mmcu=%*}"
   mmcu=at76*:-m avr3}\
 %{mmcu=atmega8*|\
   mmcu=atmega48|\
+  mmcu=at90pwm1|\
   mmcu=at90pwm2|\
   mmcu=at90pwm3:-m avr4}\
 %{mmcu=atmega16*|\
@@ -843,6 +844,7 @@ mmcu=*:-mmcu=%*}"
 %{mmcu=atmega88:crtm88.o%s} \
 %{mmcu=atmega8515:crtm8515.o%s} \
 %{mmcu=atmega8535:crtm8535.o%s} \
+%{mmcu=at90pwm1:crt90pwm1.o%s} \
 %{mmcu=at90pwm2:crt90pwm2.o%s} \
 %{mmcu=at90pwm3:crt90pwm3.o%s} \
 %{mmcu=atmega16:crtm16.o%s} \
diff --git a/gcc/config/avr/t-avr b/gcc/config/avr/t-avr
index f600c070546..09cdc0fb526 100644
--- a/gcc/config/avr/t-avr
+++ b/gcc/config/avr/t-avr
@@ -64,6 +64,7 @@ MULTILIB_MATCHES = \
 	mmcu?avr4=mmcu?atmega8515 \
 	mmcu?avr4=mmcu?atmega8535 \
 	mmcu?avr4=mmcu?atmega88 \
+	mmcu?avr4=mmcu?at90pwm1 \
 	mmcu?avr4=mmcu?at90pwm2 \
 	mmcu?avr4=mmcu?at90pwm3 \
 	mmcu?avr5=mmcu?atmega16 \