Upgrade to GCC 4.1.2.

Add support for AT90PWM1, ATmega32[59]0?P, AT90USB82/162.

4 files changed, 46 insertions, 33 deletions

diff --git a/devel/avr-gcc/Makefile b/devel/avr-gcc/Makefile
index 94ccaefa6a34..5d9114d3118c 100644
--- a/devel/avr-gcc/Makefile
+++ b/devel/avr-gcc/Makefile
@@ -6,8 +6,7 @@
 #
 
 PORTNAME=	gcc
-PORTVERSION=	4.1.1
-PORTREVISION=	1
+PORTVERSION=	4.1.2
 CATEGORIES=	devel
 MASTER_SITES=	${MASTER_SITE_GCC}
 MASTER_SITES+=	http://people.freebsd.org/~joerg/:local
diff --git a/devel/avr-gcc/distinfo b/devel/avr-gcc/distinfo
index aea02c63a969..87d783380850 100644
--- a/devel/avr-gcc/distinfo
+++ b/devel/avr-gcc/distinfo
@@ -1,6 +1,6 @@
-MD5 (gcc-core-4.1.1.tar.bz2) = a1b189c98aa7d7f164036bbe89b9b2a2
-SHA256 (gcc-core-4.1.1.tar.bz2) = f1f116d3f6281ffe961b68255bdc446cd164d7b9d159cb302236a6175d215a51
-SIZE (gcc-core-4.1.1.tar.bz2) = 17087873
-MD5 (gcc-g++-4.1.1.tar.bz2) = 70c786bf8ca042e880a87fecb9e4dfcd
-SHA256 (gcc-g++-4.1.1.tar.bz2) = 48a2fbf87ca5497f9b78c25f2763eb1df86ec7c539be0938d9c43651fc504c40
-SIZE (gcc-g++-4.1.1.tar.bz2) = 3810062
+MD5 (gcc-core-4.1.2.tar.bz2) = 2af3fb599635219171c6ae1f3034888a
+SHA256 (gcc-core-4.1.2.tar.bz2) = 7be9c5df8000ae35d0928f0a254bfb5e8478cad5e5e57fd07820530c03b3711d
+SIZE (gcc-core-4.1.2.tar.bz2) = 17485561
+MD5 (gcc-g++-4.1.2.tar.bz2) = 75c6d5fa3415d614314caf0f509e8933
+SHA256 (gcc-g++-4.1.2.tar.bz2) = 0c06aa415f10679bc334f4627242e2b383387d0d44930da2922028dbd98fa2e2
+SIZE (gcc-g++-4.1.2.tar.bz2) = 3808425
diff --git a/devel/avr-gcc/files/patch-newdevices b/devel/avr-gcc/files/patch-newdevices
index 6155126a58a6..d1eae0096877 100644
--- a/devel/avr-gcc/files/patch-newdevices
+++ b/devel/avr-gcc/files/patch-newdevices
@@ -1,7 +1,5 @@
-Index: gcc/config/avr/avr.c
-===================================================================
---- gcc/config/avr/avr.c	(revision 114367)
-+++ gcc/config/avr/avr.c	(working copy)
+--- gcc/config/avr/avr.c.orig	Thu Jul 28 00:29:46 2005
++++ gcc/config/avr/avr.c	Sat Apr  7 00:34:02 2007
 @@ -169,10 +169,19 @@
    { "at90s8515", 2, "__AVR_AT90S8515__" },
    { "at90c8534", 2, "__AVR_AT90C8534__" },
@@ -23,12 +21,14 @@ Index: gcc/config/avr/avr.c
      /* Classic, > 8K.  */
    { "avr3",      3, NULL },
    { "atmega103", 3, "__AVR_ATmega103__" },
-@@ -187,24 +196,46 @@
+@@ -187,24 +196,53 @@
    { "atmega88",   4, "__AVR_ATmega88__" },
    { "atmega8515", 4, "__AVR_ATmega8515__" },
    { "atmega8535", 4, "__AVR_ATmega8535__" },
++  { "at90pwm1",  4, "__AVR_AT90PWM1__" },
 +  { "at90pwm2",  4, "__AVR_AT90PWM2__" },
 +  { "at90pwm3",  4, "__AVR_AT90PWM3__" },
++  { "at90usb82",   4, "__AVR_AT90USB82__" },
      /* Enhanced, > 8K.  */
    { "avr5",      5, NULL },
    { "atmega16",  5, "__AVR_ATmega16__" },
@@ -45,9 +45,13 @@ Index: gcc/config/avr/avr.c
    { "atmega323", 5, "__AVR_ATmega323__" },
 +  { "atmega324p",5, "__AVR_ATmega324P__" },
    { "atmega325", 5, "__AVR_ATmega325__" },
++  { "atmega325p", 5, "__AVR_ATmega325P__" },
    { "atmega3250", 5, "__AVR_ATmega3250__" },
++  { "atmega3250p", 5, "__AVR_ATmega3250P__" },
 +  { "atmega329", 5, "__AVR_ATmega329__" },
++  { "atmega329p", 5, "__AVR_ATmega329P__" },
 +  { "atmega3290", 5, "__AVR_ATmega3290__" },
++  { "atmega3290p", 5, "__AVR_ATmega3290P__" },
 +  { "atmega406", 5, "__AVR_ATmega406__" },
    { "atmega64",  5, "__AVR_ATmega64__" },
 +  { "atmega640", 5, "__AVR_ATmega640__" },
@@ -63,6 +67,7 @@ Index: gcc/config/avr/avr.c
 +  { "at90can32", 5, "__AVR_AT90CAN32__" },
 +  { "at90can64", 5, "__AVR_AT90CAN64__" },
    { "at90can128", 5, "__AVR_AT90CAN128__" },
++  { "at90usb162",  5, "__AVR_AT90USB162__" },
 +  { "at90usb646", 5, "__AVR_AT90USB646__" },
 +  { "at90usb647", 5, "__AVR_AT90USB647__" },
 +  { "at90usb1286", 5, "__AVR_AT90USB1286__" },
@@ -70,11 +75,9 @@ Index: gcc/config/avr/avr.c
    { "at94k",     5, "__AVR_AT94K__" },
      /* Assembler only.  */
    { "avr1",      1, NULL },
-Index: gcc/config/avr/t-avr
-===================================================================
---- gcc/config/avr/t-avr	(revision 114367)
-+++ gcc/config/avr/t-avr	(working copy)
-@@ -42,21 +42,55 @@
+--- gcc/config/avr/t-avr.orig	Wed Apr  6 07:34:30 2005
++++ gcc/config/avr/t-avr	Sat Apr  7 00:37:08 2007
+@@ -42,21 +42,62 @@
  
  # The many avr2 matches are not listed here - this is the default.
  MULTILIB_MATCHES = \
@@ -95,8 +98,10 @@ Index: gcc/config/avr/t-avr
 -	mmcu?avr5=mmcu?atmega161 mmcu?avr5=mmcu?atmega162 \
 -	mmcu?avr5=mmcu?atmega163 mmcu?avr5=mmcu?atmega169 \
 -	mmcu?avr5=mmcu?atmega16 mmcu?avr5=mmcu?atmega168 \
++	mmcu?avr4=mmcu?at90pwm1 \
 +	mmcu?avr4=mmcu?at90pwm2 \
 +	mmcu?avr4=mmcu?at90pwm3 \
++	mmcu?avr4=mmcu?at90usb82 \
 +	mmcu?avr5=mmcu?atmega16 \
 +	mmcu?avr5=mmcu?atmega161 \
 +	mmcu?avr5=mmcu?atmega162 \
@@ -116,9 +121,13 @@ Index: gcc/config/avr/t-avr
 +	mmcu?avr5=mmcu?atmega323 \
 +	mmcu?avr5=mmcu?atmega324p \
 +	mmcu?avr5=mmcu?atmega325 \
++	mmcu?avr5=mmcu?atmega325p \
 +	mmcu?avr5=mmcu?atmega3250 \
++	mmcu?avr5=mmcu?atmega3250p \
 +	mmcu?avr5=mmcu?atmega329 \
++	mmcu?avr5=mmcu?atmega329p \
 +	mmcu?avr5=mmcu?atmega3290 \
++	mmcu?avr5=mmcu?atmega3290p \
 +	mmcu?avr5=mmcu?atmega406 \
 +	mmcu?avr5=mmcu?atmega64  \
 +	mmcu?avr5=mmcu?atmega640 \
@@ -134,6 +143,7 @@ Index: gcc/config/avr/t-avr
 +	mmcu?avr5=mmcu?at90can32 \
 +	mmcu?avr5=mmcu?at90can64 \
 +	mmcu?avr5=mmcu?at90can128 \
++	mmcu?avr5=mmcu?at90usb162 \
 +	mmcu?avr5=mmcu?at90usb646 \
 +	mmcu?avr5=mmcu?at90usb647 \
 +	mmcu?avr5=mmcu?at90usb1286 \
@@ -142,11 +152,9 @@ Index: gcc/config/avr/t-avr
  
  MULTILIB_EXCEPTIONS =
  
-Index: gcc/config/avr/avr.h
-===================================================================
---- gcc/config/avr/avr.h	(revision 114367)
-+++ gcc/config/avr/avr.h	(working copy)
-@@ -758,12 +758,67 @@
+--- gcc/config/avr/avr.h.orig	Sat Apr  7 00:28:34 2007
++++ gcc/config/avr/avr.h	Sat Apr  7 00:36:14 2007
+@@ -763,12 +763,66 @@
  #define ASM_SPEC "%{mmcu=*:-mmcu=%*}"
  
  #define LINK_SPEC " %{!mmcu*:-m avr2}\
@@ -181,6 +189,7 @@ Index: gcc/config/avr/avr.h
 +  mmcu=at76*:-m avr3}\
 +%{mmcu=atmega8*|\
 +  mmcu=atmega48|\
++  mmcu=at90pwm1|\
 +  mmcu=at90pwm2|\
 +  mmcu=at90pwm3:-m avr4}\
 +%{mmcu=atmega16*|\
@@ -192,10 +201,8 @@ Index: gcc/config/avr/avr.h
 +  mmcu=at90usb*|\
 +  mmcu=at94k:-m avr5}\
 +%{mmcu=atmega324*|\
-+  mmcu=atmega325|\
-+  mmcu=atmega3250|\
-+  mmcu=atmega329|\
-+  mmcu=atmega3290|\
++  mmcu=atmega325*|\
++  mmcu=atmega329*|\
 +  mmcu=atmega406|\
 +  mmcu=atmega48|\
 +  mmcu=atmega88|\
@@ -220,7 +227,7 @@ Index: gcc/config/avr/avr.h
  
  #define LIB_SPEC \
    "%{!mmcu=at90s1*:%{!mmcu=attiny11:%{!mmcu=attiny12:%{!mmcu=attiny15:%{!mmcu=attiny28: -lc }}}}}"
-@@ -799,6 +854,15 @@
+@@ -804,6 +858,15 @@
  %{mmcu=at86rf401:crt86401.o%s} \
  %{mmcu=attiny13:crttn13.o%s} \
  %{mmcu=attiny2313:crttn2313.o%s} \
@@ -236,10 +243,11 @@ Index: gcc/config/avr/avr.h
  %{mmcu=atmega103|mmcu=avr3:crtm103.o%s} \
  %{mmcu=atmega603:crtm603.o%s} \
  %{mmcu=at43usb320:crt43320.o%s} \
-@@ -809,22 +873,44 @@
+@@ -814,22 +877,51 @@
  %{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} \
@@ -256,9 +264,13 @@ Index: gcc/config/avr/avr.h
  %{mmcu=atmega323:crtm323.o%s} \
 +%{mmcu=atmega324p:crtm324p.o%s} \
  %{mmcu=atmega325:crtm325.o%s} \
++%{mmcu=atmega325p:crtm325p.o%s} \
  %{mmcu=atmega3250:crtm3250.o%s} \
++%{mmcu=atmega3250p:crtm3250p.o%s} \
 +%{mmcu=atmega329:crtm329.o%s} \
++%{mmcu=atmega329p:crtm329p.o%s} \
 +%{mmcu=atmega3290:crtm3290.o%s} \
++%{mmcu=atmega3290p:crtm3290p.o%s} \
 +%{mmcu=atmega406:crtm406.o%s} \
  %{mmcu=atmega64:crtm64.o%s} \
 -%{mmcu=atmega645:crtm6450.o%s} \
@@ -275,6 +287,8 @@ Index: gcc/config/avr/avr.h
 +%{mmcu=at90can32:crtcan32.o%s} \
 +%{mmcu=at90can64:crtcan64.o%s} \
  %{mmcu=at90can128:crtcan128.o%s} \
++%{mmcu=at90usb82:crtusb82.o%s} \
++%{mmcu=at90usb162:crtusb162.o%s} \
 +%{mmcu=at90usb646:crtusb646.o%s} \
 +%{mmcu=at90usb647:crtusb647.o%s} \
 +%{mmcu=at90usb1286:crtusb1286.o%s} \
diff --git a/devel/avr-gcc/pkg-descr b/devel/avr-gcc/pkg-descr
index 8b123c7c3910..6fd5b14e9401 100644
--- a/devel/avr-gcc/pkg-descr
+++ b/devel/avr-gcc/pkg-descr
@@ -12,12 +12,12 @@ Locally added support for the following AVR devices:
   ATtiny24/ATtiny44/ATtiny84
   ATtiny25/ATtiny45/ATtiny85      ATtiny261/ATtiny461/ATtiny861
   ATmega164P/ATmega324P/ATmega644/ATmega644P
-  ATmega165P/ATmega169P
-  ATmega329/ATmega3290/ATmega649/ATmega6490
+  ATmega165P/ATmega169P/ATmega325P/ATmega3250P
+  ATmega329/ATmega3290/ATmega649/ATmega6490, including their "P" variants
   ATmega406
   ATmega640/ATmega1280/ATmega1281
-  AT90PWM2/AT90PWM3               AT90CAN32/64
-  AT90USB646/647/1286/1287
+  AT90PWM1/PWM2/AT90PWM3          AT90CAN32/64
+  AT90USB82/162/646/647/1286/1287
   ATmega2560/ATmega2561 (beta test)
 
 WWW: http://gcc.gnu.org/