7 files changed, 727 insertions, 149 deletions

diff --git a/devel/avr-gcc-devel/Makefile b/devel/avr-gcc-devel/Makefile
index 35661db96bf7..a9f158aba3d6 100644
--- a/devel/avr-gcc-devel/Makefile
+++ b/devel/avr-gcc-devel/Makefile
@@ -6,8 +6,7 @@
 #
 
 PORTNAME=	gcc
-PORTVERSION=	4.1.0
-PORTREVISION=	5
+PORTVERSION=	4.1.1
 CATEGORIES=	devel
 MASTER_SITES=	${MASTER_SITE_GCC}
 MASTER_SITES+=	http://people.freebsd.org/~joerg/:local
diff --git a/devel/avr-gcc-devel/distinfo b/devel/avr-gcc-devel/distinfo
index a0576b82b6af..aea02c63a969 100644
--- a/devel/avr-gcc-devel/distinfo
+++ b/devel/avr-gcc-devel/distinfo
@@ -1,6 +1,6 @@
-MD5 (gcc-core-4.1.0.tar.bz2) = 15efa164579c7cf4a48859ee87d2a1fa
-SHA256 (gcc-core-4.1.0.tar.bz2) = 14d3056034cc7e7f2627f9b911e57041d135fe75b54aa20f9ab40737d5f13f21
-SIZE (gcc-core-4.1.0.tar.bz2) = 16634582
-MD5 (gcc-g++-4.1.0.tar.bz2) = 8b7006a73d62b43f2add695fbbe0584c
-SHA256 (gcc-g++-4.1.0.tar.bz2) = 4fde8de2c03a6af0f712b3f58a96bb32cb6877bcdcfb630cd005b0878ff030d7
-SIZE (gcc-g++-4.1.0.tar.bz2) = 3808683
+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
diff --git a/devel/avr-gcc-devel/files/patch-attribute_alias b/devel/avr-gcc-devel/files/patch-attribute_alias
new file mode 100644
index 000000000000..95d8ba4ece7f
--- /dev/null
+++ b/devel/avr-gcc-devel/files/patch-attribute_alias
@@ -0,0 +1,11 @@
+--- gcc/config/avr/avr.h.orig	Sat Jun 25 03:22:41 2005
++++ gcc/config/avr/avr.h	Tue Sep 26 23:07:01 2006
+@@ -631,6 +631,8 @@
+ /* Globalizing directive for a label.  */
+ #define GLOBAL_ASM_OP ".global\t"
+ 
++#define SET_ASM_OP    "\t.set\t"
++
+ #define ASM_WEAKEN_LABEL(FILE, NAME)	\
+   do					\
+     {					\
diff --git a/devel/avr-gcc-devel/files/patch-newdevices b/devel/avr-gcc-devel/files/patch-newdevices
index 380b28108e73..6155126a58a6 100644
--- a/devel/avr-gcc-devel/files/patch-newdevices
+++ b/devel/avr-gcc-devel/files/patch-newdevices
@@ -1,13 +1,12 @@
-diff -ur ../gcc-4.1.0.orig/gcc/config/avr/avr.c ./gcc/config/avr/avr.c
---- ../gcc-4.1.0.orig/gcc/config/avr/avr.c	Thu Jul 28 00:29:46 2005
-+++ ./gcc/config/avr/avr.c	Wed Mar 22 15:37:50 2006
-@@ -170,9 +170,18 @@
+Index: gcc/config/avr/avr.c
+===================================================================
+--- gcc/config/avr/avr.c	(revision 114367)
++++ gcc/config/avr/avr.c	(working copy)
+@@ -169,10 +169,19 @@
+   { "at90s8515", 2, "__AVR_AT90S8515__" },
    { "at90c8534", 2, "__AVR_AT90C8534__" },
    { "at90s8535", 2, "__AVR_AT90S8535__" },
-   { "at86rf401", 2, "__AVR_AT86RF401__" },
-+  { "attiny261", 2, "__AVR_ATtiny261__" },
-+  { "attiny461", 2, "__AVR_ATtiny461__" },
-+  { "attiny861", 2, "__AVR_ATtiny861__" },
+-  { "at86rf401", 2, "__AVR_AT86RF401__" },
      /* Classic + MOVW, <= 8K.  */
    { "attiny13",   2, "__AVR_ATtiny13__" },
    { "attiny2313", 2, "__AVR_ATtiny2313__" },
@@ -17,6 +16,10 @@ diff -ur ../gcc-4.1.0.orig/gcc/config/avr/avr.c ./gcc/config/avr/avr.c
 +  { "attiny25", 2, "__AVR_ATtiny25__" },
 +  { "attiny45", 2, "__AVR_ATtiny45__" },
 +  { "attiny85", 2, "__AVR_ATtiny85__" },
++  { "attiny261", 2, "__AVR_ATtiny261__" },
++  { "attiny461", 2, "__AVR_ATtiny461__" },
++  { "attiny861", 2, "__AVR_ATtiny861__" },
++  { "at86rf401", 2, "__AVR_AT86RF401__" },
      /* Classic, > 8K.  */
    { "avr3",      3, NULL },
    { "atmega103", 3, "__AVR_ATmega103__" },
@@ -67,27 +70,157 @@ diff -ur ../gcc-4.1.0.orig/gcc/config/avr/avr.c ./gcc/config/avr/avr.c
    { "at94k",     5, "__AVR_AT94K__" },
      /* Assembler only.  */
    { "avr1",      1, NULL },
-diff -ur ../gcc-4.1.0.orig/gcc/config/avr/avr.h ./gcc/config/avr/avr.h
---- ../gcc-4.1.0.orig/gcc/config/avr/avr.h	Sat Jun 25 03:22:41 2005
-+++ ./gcc/config/avr/avr.h	Wed Mar 22 15:50:25 2006
-@@ -759,11 +759,12 @@
+Index: gcc/config/avr/t-avr
+===================================================================
+--- gcc/config/avr/t-avr	(revision 114367)
++++ gcc/config/avr/t-avr	(working copy)
+@@ -42,21 +42,55 @@
+ 
+ # The many avr2 matches are not listed here - this is the default.
+ MULTILIB_MATCHES = \
+-	mmcu?avr3=mmcu?atmega103 mmcu?avr3=mmcu?atmega603 \
+-	mmcu?avr3=mmcu?at43usb320 mmcu?avr3=mmcu?at43usb355 \
++	mmcu?avr3=mmcu?atmega103 \
++	mmcu?avr3=mmcu?atmega603 \
++	mmcu?avr3=mmcu?at43usb320 \
++	mmcu?avr3=mmcu?at43usb355 \
+ 	mmcu?avr3=mmcu?at76c711 \
+-	mmcu?avr4=mmcu?atmega8515 mmcu?avr4=mmcu?atmega8535 \
+-	mmcu?avr4=mmcu?atmega8 mmcu?avr4=mmcu?atmega48 \
++	mmcu?avr4=mmcu?atmega48 \
++	mmcu?avr4=mmcu?atmega8 \
++	mmcu?avr4=mmcu?atmega8515 \
++	mmcu?avr4=mmcu?atmega8535 \
+ 	mmcu?avr4=mmcu?atmega88 \
+-	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?at90pwm2 \
++	mmcu?avr4=mmcu?at90pwm3 \
++	mmcu?avr5=mmcu?atmega16 \
++	mmcu?avr5=mmcu?atmega161 \
++	mmcu?avr5=mmcu?atmega162 \
++	mmcu?avr5=mmcu?atmega163 \
++	mmcu?avr5=mmcu?atmega164p \
+ 	mmcu?avr5=mmcu?atmega165 \
+-	mmcu?avr5=mmcu?atmega323 mmcu?avr5=mmcu?atmega32 \
+-	mmcu?avr5=mmcu?atmega325 mmcu?avr5=mmcu?atmega3250 \
+-	mmcu?avr5=mmcu?atmega64  mmcu?avr5=mmcu?atmega128 \
+-	mmcu?avr5=mmcu?atmega645 mmcu?avr5=mmcu?atmega6450 \
+-	mmcu?avr5=mmcu?at94k mmcu?avr5=mmcu?at90can128
++	mmcu?avr5=mmcu?atmega165p \
++	mmcu?avr5=mmcu?atmega168 \
++	mmcu?avr5=mmcu?atmega169 \
++	mmcu?avr5=mmcu?atmega169p \
++	mmcu?avr5=mmcu?atmega32 \
++	mmcu?avr5=mmcu?atmega323 \
++	mmcu?avr5=mmcu?atmega324p \
++	mmcu?avr5=mmcu?atmega325 \
++	mmcu?avr5=mmcu?atmega3250 \
++	mmcu?avr5=mmcu?atmega329 \
++	mmcu?avr5=mmcu?atmega3290 \
++	mmcu?avr5=mmcu?atmega406 \
++	mmcu?avr5=mmcu?atmega64  \
++	mmcu?avr5=mmcu?atmega640 \
++	mmcu?avr5=mmcu?atmega644 \
++	mmcu?avr5=mmcu?atmega644p \
++	mmcu?avr5=mmcu?atmega645 \
++	mmcu?avr5=mmcu?atmega6450 \
++	mmcu?avr5=mmcu?atmega649 \
++	mmcu?avr5=mmcu?atmega6490 \
++	mmcu?avr5=mmcu?atmega128 \
++	mmcu?avr5=mmcu?atmega1280 \
++	mmcu?avr5=mmcu?atmega1281 \
++	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 =
+ 
+Index: gcc/config/avr/avr.h
+===================================================================
+--- gcc/config/avr/avr.h	(revision 114367)
++++ gcc/config/avr/avr.h	(working copy)
+@@ -758,12 +758,67 @@
+ #define ASM_SPEC "%{mmcu=*:-mmcu=%*}"
  
  #define LINK_SPEC " %{!mmcu*:-m avr2}\
- %{mmcu=at90s1200|mmcu=attiny11|mmcu=attiny12|mmcu=attiny15|mmcu=attiny28:-m avr1} \
+-%{mmcu=at90s1200|mmcu=attiny11|mmcu=attiny12|mmcu=attiny15|mmcu=attiny28:-m avr1} \
 -%{mmcu=attiny22|mmcu=attiny26|mmcu=at90s2*|mmcu=at90s4*|mmcu=at90s8*|mmcu=at90c8*|mmcu=at86rf401|mmcu=attiny13|mmcu=attiny2313:-m avr2}\
-+%{mmcu=attiny22|mmcu=attiny26|mmcu=at90s2*|mmcu=at90s4*|mmcu=at90s8*|mmcu=at90c8*|mmcu=at86rf401|mmcu=attiny13|mmcu=attiny2313|mmcu=attiny24|mmcu=attiny44|mmcu=attiny84|mmcu=attiny25|mmcu=attiny45|mmcu=attiny85|mmcu=attiny261|mmcu=attiny461|mmcu=attiny861:-m avr2}\
- %{mmcu=atmega103|mmcu=atmega603|mmcu=at43*|mmcu=at76*:-m avr3}\
+-%{mmcu=atmega103|mmcu=atmega603|mmcu=at43*|mmcu=at76*:-m avr3}\
 -%{mmcu=atmega8*|mmcu=atmega48:-m avr4}\
 -%{mmcu=atmega16*|mmcu=atmega32*|mmcu=atmega64*|mmcu=atmega128|mmcu=at90can128|mmcu=at94k:-m avr5}\
 -%{mmcu=atmega325|mmcu=atmega3250|mmcu=atmega48|mmcu=atmega88|mmcu=atmega64|mmcu=atmega645|mmcu=atmega6450|mmcu=atmega128|mmcu=at90can128|mmcu=at90can128|mmcu=atmega162|mmcu=atmega165|mmcu=atmega168|mmcu=atmega169: -Tdata 0x800100} "
-+%{mmcu=atmega8*|mmcu=atmega48|mmcu=at90pwm*:-m avr4}\
-+%{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} "
++%{mmcu=at90s1200|\
++  mmcu=attiny11|\
++  mmcu=attiny12|\
++  mmcu=attiny15|\
++  mmcu=attiny28:-m avr1}\
++%{mmcu=attiny22|\
++  mmcu=attiny26|\
++  mmcu=at90s2*|\
++  mmcu=at90s4*|\
++  mmcu=at90s8*|\
++  mmcu=at90c8*|\
++  mmcu=at86rf401|\
++  mmcu=attiny13|\
++  mmcu=attiny2313|\
++  mmcu=attiny24|\
++  mmcu=attiny25|\
++  mmcu=attiny261|\
++  mmcu=attiny4*|\
++  mmcu=attiny8*:-m avr2}\
++%{mmcu=atmega103|\
++  mmcu=atmega603|\
++  mmcu=at43*|\
++  mmcu=at76*:-m avr3}\
++%{mmcu=atmega8*|\
++  mmcu=atmega48|\
++  mmcu=at90pwm2|\
++  mmcu=at90pwm3:-m avr4}\
++%{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=atmega162|\
++  mmcu=atmega164*|\
++  mmcu=atmega165*|\
++  mmcu=atmega168|\
++  mmcu=atmega169*|\
++  mmcu=at90can*|\
++  mmcu=at90pwm*|\
++  mmcu=at90usb*: -Tdata 0x800100}\
++%{mmcu=atmega640|\
++  mmcu=atmega1280|\
++  mmcu=atmega1281: -Tdata 0x800200} "
  
  #define LIB_SPEC \
    "%{!mmcu=at90s1*:%{!mmcu=attiny11:%{!mmcu=attiny12:%{!mmcu=attiny15:%{!mmcu=attiny28: -lc }}}}}"
-@@ -799,6 +800,15 @@
+@@ -799,6 +854,15 @@
  %{mmcu=at86rf401:crt86401.o%s} \
  %{mmcu=attiny13:crttn13.o%s} \
  %{mmcu=attiny2313:crttn2313.o%s} \
@@ -103,7 +236,7 @@ diff -ur ../gcc-4.1.0.orig/gcc/config/avr/avr.h ./gcc/config/avr/avr.h
  %{mmcu=atmega103|mmcu=avr3:crtm103.o%s} \
  %{mmcu=atmega603:crtm603.o%s} \
  %{mmcu=at43usb320:crt43320.o%s} \
-@@ -809,22 +819,44 @@
+@@ -809,22 +873,44 @@
  %{mmcu=atmega88:crtm88.o%s} \
  %{mmcu=atmega8515:crtm8515.o%s} \
  %{mmcu=atmega8535:crtm8535.o%s} \
@@ -149,74 +282,3 @@ diff -ur ../gcc-4.1.0.orig/gcc/config/avr/avr.h ./gcc/config/avr/avr.h
  %{mmcu=at94k:crtat94k.o%s}"
  
  #define EXTRA_SPECS {"crt_binutils", CRT_BINUTILS_SPECS},
-diff -ur ../gcc-4.1.0.orig/gcc/config/avr/t-avr ./gcc/config/avr/t-avr
---- ../gcc-4.1.0.orig/gcc/config/avr/t-avr	Wed Apr  6 07:34:30 2005
-+++ ./gcc/config/avr/t-avr	Wed Mar 22 15:55:57 2006
-@@ -42,21 +42,55 @@
- 
- # The many avr2 matches are not listed here - this is the default.
- MULTILIB_MATCHES = \
--	mmcu?avr3=mmcu?atmega103 mmcu?avr3=mmcu?atmega603 \
--	mmcu?avr3=mmcu?at43usb320 mmcu?avr3=mmcu?at43usb355 \
-+	mmcu?avr3=mmcu?atmega103 \
-+	mmcu?avr3=mmcu?atmega603 \
-+	mmcu?avr3=mmcu?at43usb320 \
-+	mmcu?avr3=mmcu?at43usb355 \
- 	mmcu?avr3=mmcu?at76c711 \
--	mmcu?avr4=mmcu?atmega8515 mmcu?avr4=mmcu?atmega8535 \
--	mmcu?avr4=mmcu?atmega8 mmcu?avr4=mmcu?atmega48 \
-+	mmcu?avr4=mmcu?atmega48 \
-+	mmcu?avr4=mmcu?atmega8 \
-+	mmcu?avr4=mmcu?atmega8515 \
-+	mmcu?avr4=mmcu?atmega8535 \
- 	mmcu?avr4=mmcu?atmega88 \
--	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?at90pwm2 \
-+	mmcu?avr4=mmcu?at90pwm3 \
-+	mmcu?avr5=mmcu?atmega16 \
-+	mmcu?avr5=mmcu?atmega161 \
-+	mmcu?avr5=mmcu?atmega162 \
-+	mmcu?avr5=mmcu?atmega163 \
-+	mmcu?avr5=mmcu?atmega164p \
- 	mmcu?avr5=mmcu?atmega165 \
-+	mmcu?avr5=mmcu?atmega165p \
--	mmcu?avr5=mmcu?atmega323 mmcu?avr5=mmcu?atmega32 \
--	mmcu?avr5=mmcu?atmega325 mmcu?avr5=mmcu?atmega3250 \
--	mmcu?avr5=mmcu?atmega64  mmcu?avr5=mmcu?atmega128 \
--	mmcu?avr5=mmcu?atmega645 mmcu?avr5=mmcu?atmega6450 \
--	mmcu?avr5=mmcu?at94k mmcu?avr5=mmcu?at90can128
-+	mmcu?avr5=mmcu?atmega168 \
-+	mmcu?avr5=mmcu?atmega169 \
-+	mmcu?avr5=mmcu?atmega169p \
-+	mmcu?avr5=mmcu?atmega32 \
-+	mmcu?avr5=mmcu?atmega323 \
-+	mmcu?avr5=mmcu?atmega324p \
-+	mmcu?avr5=mmcu?atmega325 \
-+	mmcu?avr5=mmcu?atmega3250 \
-+	mmcu?avr5=mmcu?atmega329 \
-+	mmcu?avr5=mmcu?atmega3290 \
-+	mmcu?avr5=mmcu?atmega406 \
-+	mmcu?avr5=mmcu?atmega64  \
-+	mmcu?avr5=mmcu?atmega640 \
-+	mmcu?avr5=mmcu?atmega644 \
-+	mmcu?avr5=mmcu?atmega644p \
-+	mmcu?avr5=mmcu?atmega645 \
-+	mmcu?avr5=mmcu?atmega6450 \
-+	mmcu?avr5=mmcu?atmega649 \
-+	mmcu?avr5=mmcu?atmega6490 \
-+	mmcu?avr5=mmcu?atmega128 \
-+	mmcu?avr5=mmcu?atmega1280 \
-+	mmcu?avr5=mmcu?atmega1281 \
-+	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 =
- 
diff --git a/devel/avr-gcc-devel/files/patch-zz-atmega256x b/devel/avr-gcc-devel/files/patch-zz-atmega256x
new file mode 100644
index 000000000000..fd1e9085232d
--- /dev/null
+++ b/devel/avr-gcc-devel/files/patch-zz-atmega256x
@@ -0,0 +1,499 @@
+diff -ur gcc/config/avr/avr.c gcc-4.1.1-new-devices-m256/gcc/config/avr/avr.c
+--- gcc/config/avr/avr.c	2006-09-07 20:19:07.276183419 +0200
++++ gcc/config/avr/avr.c	2006-09-07 20:49:56.268363803 +0200
+@@ -123,20 +123,26 @@
+ /* Assembler only.  */
+ int avr_asm_only_p = 0;
+ 
++/* Usually holds the value 2, but could be 3 for the larger devices with a
++   3-byte program counter.  */
++int avr_pc_size = 2;
++
+ struct base_arch_s {
+   int asm_only;
+   int enhanced;
+   int mega;
++  int three_byte_pc;
+   const char *const macro;
+ };
+ 
+ static const struct base_arch_s avr_arch_types[] = {
+-  { 1, 0, 0, NULL },  /* unknown device specified */
+-  { 1, 0, 0, "__AVR_ARCH__=1" },
+-  { 0, 0, 0, "__AVR_ARCH__=2" },
+-  { 0, 0, 1, "__AVR_ARCH__=3" },
+-  { 0, 1, 0, "__AVR_ARCH__=4" },
+-  { 0, 1, 1, "__AVR_ARCH__=5" }
++  { 1, 0, 0, 0, NULL },  /* unknown device specified */
++  { 1, 0, 0, 0, "__AVR_ARCH__=1" },
++  { 0, 0, 0, 0, "__AVR_ARCH__=2" },
++  { 0, 0, 1, 0, "__AVR_ARCH__=3" },
++  { 0, 1, 0, 0, "__AVR_ARCH__=4" },
++  { 0, 1, 1, 0, "__AVR_ARCH__=5" },
++  { 0, 1, 1, 1, "__AVR_ARCH__=6" }
+ };
+ 
+ struct mcu_type_s {
+@@ -237,6 +243,10 @@
+   { "at90usb1286", 5, "__AVR_AT90USB1286__" },
+   { "at90usb1287", 5, "__AVR_AT90USB1287__" },
+   { "at94k",     5, "__AVR_AT94K__" },
++    /* 3-Byte PC */
++  { "avr6",      6, NULL },
++  { "atmega2560",     6, "__AVR_ATmega2560__" },
++  { "atmega2561",     6, "__AVR_ATmega2561__" },
+     /* Assembler only.  */
+   { "avr1",      1, NULL },
+   { "at90s1200", 1, "__AVR_AT90S1200__" },
+@@ -319,6 +329,11 @@
+   avr_base_arch_macro = base->macro;
+   avr_extra_arch_macro = t->macro;
+ 
++  if (base->three_byte_pc)
++    avr_pc_size = 3;
++  else
++    avr_pc_size = 2;
++
+   if (optimize && !TARGET_NO_TABLEJUMP)
+     avr_case_values_threshold = (!AVR_MEGA || TARGET_CALL_PROLOGUES) ? 8 : 17;
+ 
+@@ -476,7 +491,7 @@
+       int offset = frame_pointer_needed ? 2 : 0;
+ 
+       offset += avr_regs_to_save (NULL);
+-      return get_frame_size () + 2 + 1 + offset;
++      return get_frame_size () + (avr_pc_size) + 1 + offset;
+     }
+ }
+ 
+@@ -660,7 +675,6 @@
+   int reg;
+   int interrupt_func_p;
+   int signal_func_p;
+-  int main_p;
+   int live_seq;
+   int minimize;
+ 
+@@ -678,7 +692,6 @@
+ 
+   interrupt_func_p = interrupt_function_p (current_function_decl);
+   signal_func_p = signal_function_p (current_function_decl);
+-  main_p = MAIN_NAME_P (DECL_NAME (current_function_decl));
+   live_seq = sequent_regs_live ();
+   minimize = (TARGET_CALL_PROLOGUES
+ 	      && !interrupt_func_p && !signal_func_p && live_seq);
+@@ -698,25 +711,14 @@
+ 	       AS1 (clr,__zero_reg__)    "\n");
+       prologue_size += 5;
+     }
+-  if (main_p)
+-    {
+-      fprintf (file, ("\t" 
+-		      AS1 (ldi,r28) ",lo8(%s - " HOST_WIDE_INT_PRINT_DEC ")" CR_TAB
+-		      AS1 (ldi,r29) ",hi8(%s - " HOST_WIDE_INT_PRINT_DEC ")" CR_TAB
+-		      AS2 (out,__SP_H__,r29)     CR_TAB
+-		      AS2 (out,__SP_L__,r28) "\n"),
+-	       avr_init_stack, size, avr_init_stack, size);
+-      
+-      prologue_size += 4;
+-    }
+-  else if (minimize && (frame_pointer_needed || live_seq > 6)) 
++  if (minimize && (frame_pointer_needed || live_seq > 6)) 
+     {
+       fprintf (file, ("\t"
+ 		      AS1 (ldi, r26) ",lo8(" HOST_WIDE_INT_PRINT_DEC ")" CR_TAB
+ 		      AS1 (ldi, r27) ",hi8(" HOST_WIDE_INT_PRINT_DEC ")" CR_TAB), size, size);
+ 
+-      fputs ((AS2 (ldi,r30,pm_lo8(1f)) CR_TAB
+-	      AS2 (ldi,r31,pm_hi8(1f)) CR_TAB), file);
++      fputs ((AS2 (ldi,r30,lo8(gs(1f))) CR_TAB
++	      AS2 (ldi,r31,lo8(gs(1f))) CR_TAB), file);
+       
+       prologue_size += 4;
+       
+@@ -787,7 +789,6 @@
+   int reg;
+   int interrupt_func_p;
+   int signal_func_p;
+-  int main_p;
+   int function_size;
+   int live_seq;
+   int minimize;
+@@ -819,27 +820,12 @@
+ 
+   interrupt_func_p = interrupt_function_p (current_function_decl);
+   signal_func_p = signal_function_p (current_function_decl);
+-  main_p = MAIN_NAME_P (DECL_NAME (current_function_decl));
++
+   live_seq = sequent_regs_live ();
+   minimize = (TARGET_CALL_PROLOGUES
+ 	      && !interrupt_func_p && !signal_func_p && live_seq);
+   
+-  if (main_p)
+-    {
+-      /* Return value from main() is already in the correct registers
+-	 (r25:r24) as the exit() argument.  */
+-      if (AVR_MEGA)
+-	{
+-	  fputs ("\t" AS1 (jmp,exit) "\n", file);
+-	  epilogue_size += 2;
+-	}
+-      else
+-	{
+-	  fputs ("\t" AS1 (rjmp,exit) "\n", file);
+-	  ++epilogue_size;
+-	}
+-    }
+-  else if (minimize && (frame_pointer_needed || live_seq > 4))
++  if (minimize && (frame_pointer_needed || live_seq > 4))
+     {
+       fprintf (file, ("\t" AS2 (ldi, r30, %d) CR_TAB), live_seq);
+       ++epilogue_size;
+@@ -1097,7 +1083,7 @@
+ 	  && ((GET_CODE (addr) == SYMBOL_REF && SYMBOL_REF_FUNCTION_P (addr))
+ 	      || GET_CODE (addr) == LABEL_REF))
+ 	{
+-	  fprintf (file, "pm(");
++	  fprintf (file, "gs(");
+ 	  output_addr_const (file,addr);
+ 	  fprintf (file ,")");
+ 	}
+@@ -4518,7 +4504,7 @@
+       && ((GET_CODE (x) == SYMBOL_REF && SYMBOL_REF_FUNCTION_P (x))
+ 	  || GET_CODE (x) == LABEL_REF))
+     {
+-      fputs ("\t.word\tpm(", asm_out_file);
++      fputs ("\t.word\tgs(", asm_out_file);
+       output_addr_const (asm_out_file, x);
+       fputs (")\n", asm_out_file);
+       return true;
+@@ -5880,7 +5866,7 @@
+ {
+   progmem_section ();
+   if (AVR_MEGA)
+-    fprintf (stream, "\t.word pm(.L%d)\n", value);
++    fprintf (stream, "\t.word gs(.L%d)\n", value);
+   else
+     fprintf (stream, "\trjmp .L%d\n", value);
+ 
+diff -ur gcc/config/avr/avr.h gcc-4.1.1-new-devices-m256/gcc/config/avr/avr.h
+--- gcc/config/avr/avr.h	2006-09-07 20:19:07.304181348 +0200
++++ gcc/config/avr/avr.h	2006-09-07 20:49:56.277363137 +0200
+@@ -33,6 +33,10 @@
+ 	builtin_define (avr_extra_arch_macro);	\
+       if (avr_asm_only_p)			\
+ 	builtin_define ("__AVR_ASM_ONLY__");	\
++      if (avr_pc_size == 2)			\
++	builtin_define ("__AVR_2_BYTE_PC__");	\
++      if (avr_pc_size == 3)			\
++	builtin_define ("__AVR_3_BYTE_PC__");	\
+       if (avr_enhanced_p)			\
+ 	builtin_define ("__AVR_ENHANCED__");	\
+       if (avr_mega_p)				\
+@@ -47,10 +51,14 @@
+ extern int avr_mega_p;
+ extern int avr_enhanced_p;
+ extern int avr_asm_only_p;
++extern int avr_pc_size;
+ 
+ #define AVR_MEGA (avr_mega_p && !TARGET_SHORT_CALLS)
+ #define AVR_ENHANCED (avr_enhanced_p)
+ 
++#define AVR_3_BYTE_PC (avr_pc_size == 3)
++#define AVR_2_BYTE_PC (avr_pc_size == 2)
++
+ #define TARGET_VERSION fprintf (stderr, " (GNU assembler syntax)");
+ 
+ #define OVERRIDE_OPTIONS avr_override_options ()
+@@ -747,12 +755,13 @@
+ 
+ #define CPP_SPEC "%{posix:-D_POSIX_SOURCE}"
+ 
+-#define CC1_SPEC "%{profile:-p}"
++#define CC1_SPEC "%{profile:-p} -fno-delete-null-pointer-checks"
+ 
+ #define CC1PLUS_SPEC "%{!frtti:-fno-rtti} \
+     %{!fenforce-eh-specs:-fno-enforce-eh-specs} \
+-    %{!fexceptions:-fno-exceptions}"
+-/* A C string constant that tells the GCC drvier program options to
++    %{!fexceptions:-fno-exceptions} \
++    -fno-delete-null-pointer-checks"
++/* A C string constant that tells the GCC driver program options to
+    pass to `cc1plus'.  */
+ 
+ #define ASM_SPEC "%{mmcu=*:-mmcu=%*}"
+@@ -793,6 +802,7 @@
+   mmcu=at90can*|\
+   mmcu=at90usb*|\
+   mmcu=at94k:-m avr5}\
++%{mmcu=atmega256*:-m avr6}\
+ %{mmcu=atmega324*|\
+   mmcu=atmega325|\
+   mmcu=atmega3250|\
+@@ -818,7 +828,8 @@
+   mmcu=at90usb*: -Tdata 0x800100}\
+ %{mmcu=atmega640|\
+   mmcu=atmega1280|\
+-  mmcu=atmega1281: -Tdata 0x800200} "
++  mmcu=atmega1281|\
++  mmcu=atmega256*: -Tdata 0x800200} "
+ 
+ #define LIB_SPEC \
+   "%{!mmcu=at90s1*:%{!mmcu=attiny11:%{!mmcu=attiny12:%{!mmcu=attiny15:%{!mmcu=attiny28: -lc }}}}}"
+@@ -904,6 +915,8 @@
+ %{mmcu=atmega128:crtm128.o%s} \
+ %{mmcu=atmega1280:crtm1280.o%s} \
+ %{mmcu=atmega1281:crtm1281.o%s} \
++%{mmcu=atmega2560:crtm2560.o%s} \
++%{mmcu=atmega2561:crtm2561.o%s} \
+ %{mmcu=at90can32:crtcan32.o%s} \
+ %{mmcu=at90can64:crtcan64.o%s} \
+ %{mmcu=at90can128:crtcan128.o%s} \
+diff -ur gcc/config/avr/avr.md gcc-4.1.1-new-devices-m256/gcc/config/avr/avr.md
+--- gcc/config/avr/avr.md	2005-06-28 21:56:23.000000000 +0200
++++ gcc/config/avr/avr.md	2006-09-07 20:49:56.246365431 +0200
+@@ -2087,22 +2087,47 @@
+   "(register_operand (operands[0], HImode) || CONSTANT_P (operands[0]))"
+   "*{
+   if (which_alternative==0)
+-     return \"icall\";
++    {
++      if (AVR_3_BYTE_PC)
++        return \"eicall\";
++      else
++        return \"icall\";
++    }
+   else if (which_alternative==1)
+     {
+       if (AVR_ENHANCED)
+-	return (AS2 (movw, r30, %0) CR_TAB
+-		\"icall\");
++        {
++          if (AVR_3_BYTE_PC)
++            return (AS2 (movw, r30, %0) CR_TAB
++                    \"eicall\");
++          else
++            return (AS2 (movw, r30, %0) CR_TAB
++                    \"icall\");
++        }
+       else
+-	return (AS2 (mov, r30, %A0) CR_TAB
+-		AS2 (mov, r31, %B0) CR_TAB
+-		\"icall\");
++        {
++          if (AVR_3_BYTE_PC)
++	    return (AS2 (mov, r30, %A0) CR_TAB
++                    AS2 (mov, r31, %B0) CR_TAB
++                    \"eicall\");
++          else
++	    return (AS2 (mov, r30, %A0) CR_TAB
++                    AS2 (mov, r31, %B0) CR_TAB
++                    \"icall\");
++        }
+     }
+   else if (which_alternative==2)
+     return AS1(%~call,%c0);
+-  return (AS2 (ldi,r30,lo8(%0)) CR_TAB
+-          AS2 (ldi,r31,hi8(%0)) CR_TAB
+-          \"icall\");
++
++
++  if (AVR_3_BYTE_PC)
++    return (AS2 (ldi,r30,lo8(%0)) CR_TAB
++            AS2 (ldi,r31,hi8(%0)) CR_TAB
++            \"eicall\");
++  else
++    return (AS2 (ldi,r30,lo8(%0)) CR_TAB
++            AS2 (ldi,r31,hi8(%0)) CR_TAB
++            \"icall\");
+ }"
+   [(set_attr "cc" "clobber,clobber,clobber,clobber")
+    (set_attr_alternative "length"
+@@ -2124,22 +2149,46 @@
+   "(register_operand (operands[0], VOIDmode) || CONSTANT_P (operands[0]))"
+   "*{
+   if (which_alternative==0)
+-     return \"icall\";
++    {
++      if (AVR_3_BYTE_PC)
++        return \"eicall\";
++      else
++        return \"icall\";
++    }
+   else if (which_alternative==1)
+     {
+       if (AVR_ENHANCED)
+-	return (AS2 (movw, r30, %1) CR_TAB
+-		\"icall\");
++        {
++          if (AVR_3_BYTE_PC)
++            return (AS2 (movw, r30, %1) CR_TAB
++                    \"eicall\");
++          else
++            return (AS2 (movw, r30, %1) CR_TAB
++                    \"icall\");
++        }
+       else
+-	return (AS2 (mov, r30, %A1) CR_TAB
+-		AS2 (mov, r31, %B1) CR_TAB
+-		\"icall\");
++        {
++          if (AVR_3_BYTE_PC)
++            return (AS2 (mov, r30, %A1) CR_TAB
++                    AS2 (mov, r31, %B1) CR_TAB
++                    \"eicall\");
++          else
++            return (AS2 (mov, r30, %A1) CR_TAB
++                    AS2 (mov, r31, %B1) CR_TAB
++                    \"icall\");
++        }
+     }
+   else if (which_alternative==2)
+     return AS1(%~call,%c1);
+-  return (AS2 (ldi, r30, lo8(%1)) CR_TAB
+-          AS2 (ldi, r31, hi8(%1)) CR_TAB
+-          \"icall\");
++
++  if (AVR_3_BYTE_PC)
++    return (AS2 (ldi, r30, lo8(%1)) CR_TAB
++            AS2 (ldi, r31, hi8(%1)) CR_TAB
++            \"eicall\");
++  else
++    return (AS2 (ldi, r30, lo8(%1)) CR_TAB
++            AS2 (ldi, r31, hi8(%1)) CR_TAB
++            \"icall\");
+ }"
+   [(set_attr "cc" "clobber,clobber,clobber,clobber")
+    (set_attr_alternative "length"
+@@ -2169,13 +2218,20 @@
+ ; indirect jump
+ (define_insn "indirect_jump"
+   [(set (pc) (match_operand:HI 0 "register_operand" "!z,*r"))]
+-  ""
++  "AVR_2_BYTE_PC"
+   "@
+ 	ijmp
+ 	push %A0\;push %B0\;ret"
+   [(set_attr "length" "1,3")
+    (set_attr "cc" "none,none")])
+ 
++(define_insn "*indirect_jump_avr6"
++  [(set (pc) (match_operand:HI 0 "register_operand" "z"))]
++  "AVR_3_BYTE_PC"
++  "eijmp"
++  [(set_attr "length" "1")
++   (set_attr "cc" "none")])
++
+ ;; table jump
+ 
+ ;; Table made from "rjmp" instructions for <=8K devices.
+@@ -2183,7 +2239,7 @@
+   [(set (pc) (unspec:HI [(match_operand:HI 0 "register_operand" "!z,*r")] 1))
+    (use (label_ref (match_operand 1 "" "")))
+    (clobber (match_dup 0))]
+-  "!AVR_MEGA"
++  "(!AVR_MEGA) && (AVR_2_BYTE_PC)"
+   "@
+ 	ijmp
+ 	push %A0\;push %B0\;ret"
+@@ -2200,11 +2256,26 @@
+   [(set_attr "length" "2")
+    (set_attr "cc" "clobber")])
+ 
++(define_insn "*tablejump_avr6"
++  [(set (pc) (unspec:HI [(match_operand:HI 0 "register_operand" "z")]
++                        1))
++   (use (label_ref (match_operand 1 "" "")))
++   (clobber (match_dup 0))]
++  "AVR_MEGA && AVR_ENHANCED && AVR_3_BYTE_PC"
++  "lsl r30
++	rol r31
++	lpm __tmp_reg__,Z+
++	lpm r31,Z
++	mov r30,__tmp_reg__
++	eijmp"
++  [(set_attr "length" "6")
++   (set_attr "cc" "clobber")])
++
+ (define_insn "*tablejump_enh"
+   [(set (pc) (unspec:HI [(match_operand:HI 0 "register_operand" "z")] 1))
+    (use (label_ref (match_operand 1 "" "")))
+    (clobber (match_dup 0))]
+-  "AVR_MEGA && AVR_ENHANCED"
++  "AVR_MEGA && AVR_ENHANCED && AVR_2_BYTE_PC"
+   "lsl r30
+ 	rol r31
+ 	lpm __tmp_reg__,Z+
+@@ -2218,7 +2289,7 @@
+   [(set (pc) (unspec:HI [(match_operand:HI 0 "register_operand" "z")] 1))
+    (use (label_ref (match_operand 1 "" "")))
+    (clobber (match_dup 0))]
+-  "AVR_MEGA"
++  "AVR_MEGA && AVR_2_BYTE_PC"
+   "lsl r30
+ 	rol r31
+ 	lpm
+diff -ur gcc/config/avr/libgcc.S gcc-4.1.1-new-devices-m256/gcc/config/avr/libgcc.S
+--- gcc/config/avr/libgcc.S	2005-06-25 03:22:41.000000000 +0200
++++ gcc/config/avr/libgcc.S	2006-09-07 20:49:56.232366466 +0200
+@@ -593,7 +593,12 @@
+ 	out	__SP_H__,r29
+ 	out	__SREG__,__tmp_reg__
+ 	out	__SP_L__,r28
++#if defined (__AVR_3_BYTE_PC__)
++	eijmp
++#else
+ 	ijmp
++#endif
++
+ .endfunc
+ #endif /* defined (L_prologue) */
+ 
+@@ -672,13 +677,22 @@
+ 	lpm	__tmp_reg__, Z+
+ 	lpm	r31, Z
+ 	mov	r30, __tmp_reg__
++
++#if defined (__AVR_3_BYTE_PC__)
++	eijmp
++#else
+ 	ijmp
++#endif
++
+ #else
+ 	lpm
+ 	adiw	r30, 1
+ 	push	r0
+ 	lpm
+ 	push	r0
++#if defined (__AVR_3_BYTE_PC__)
++        push    __zero_reg__
++#endif
+ 	ret
+ #endif
+ 	.endfunc
+diff -ur gcc/config/avr/t-avr gcc-4.1.1-new-devices-m256/gcc/config/avr/t-avr
+--- gcc/config/avr/t-avr	2006-09-07 20:19:07.299181718 +0200
++++ gcc/config/avr/t-avr	2006-09-07 20:49:56.273363433 +0200
+@@ -37,8 +37,8 @@
+ 
+ FPBIT = fp-bit.c
+ 
+-MULTILIB_OPTIONS = mmcu=avr2/mmcu=avr3/mmcu=avr4/mmcu=avr5
+-MULTILIB_DIRNAMES = avr2 avr3 avr4 avr5
++MULTILIB_OPTIONS = mmcu=avr2/mmcu=avr3/mmcu=avr4/mmcu=avr5/mmcu=avr6
++MULTILIB_DIRNAMES = avr2 avr3 avr4 avr5 avr6
+ 
+ # The many avr2 matches are not listed here - this is the default.
+ MULTILIB_MATCHES = \
+@@ -90,7 +90,9 @@
+ 	mmcu?avr5=mmcu?at90usb647 \
+ 	mmcu?avr5=mmcu?at90usb1286 \
+ 	mmcu?avr5=mmcu?at90usb1287 \
+-	mmcu?avr5=mmcu?at94k
++	mmcu?avr5=mmcu?at94k \
++	mmcu?avr6=mmcu?atmega2560 \
++	mmcu?avr6=mmcu?atmega2561
+ 
+ MULTILIB_EXCEPTIONS =
+ 
diff --git a/devel/avr-gcc-devel/pkg-descr b/devel/avr-gcc-devel/pkg-descr
index b8cac148c715..8b123c7c3910 100644
--- a/devel/avr-gcc-devel/pkg-descr
+++ b/devel/avr-gcc-devel/pkg-descr
@@ -5,6 +5,7 @@ use without a libstdc++, and it is little tested.
 
 Supported debugging formats: -gdwarf-2 [default], -gstabs
 Locally hack added: recognizes 0bXXX binary constants
+Backported GCC 4.2 patch for __attribute__((alias))
 
 Locally added support for the following AVR devices:
 
@@ -17,6 +18,7 @@ Locally added support for the following AVR devices:
   ATmega640/ATmega1280/ATmega1281
   AT90PWM2/AT90PWM3               AT90CAN32/64
   AT90USB646/647/1286/1287
+  ATmega2560/ATmega2561 (beta test)
 
 WWW: http://gcc.gnu.org/
 WWW: http://www.nongnu.org/avr-libc/
diff --git a/devel/avr-gcc-devel/pkg-plist b/devel/avr-gcc-devel/pkg-plist
index 591a96fe06a3..9277ed00b2a4 100644
--- a/devel/avr-gcc-devel/pkg-plist
+++ b/devel/avr-gcc-devel/pkg-plist
@@ -5,47 +5,49 @@ bin/avr-c++
 bin/avr-cpp
 bin/avr-g++
 bin/avr-gcc
-bin/avr-gcc-4.1.0
+bin/avr-gcc-4.1.1
 bin/avr-gccbug
-lib/gcc/avr/4.1.0/avr3/libgcc.a
-lib/gcc/avr/4.1.0/avr3/libgcov.a
-lib/gcc/avr/4.1.0/avr4/libgcc.a
-lib/gcc/avr/4.1.0/avr4/libgcov.a
-lib/gcc/avr/4.1.0/avr5/libgcc.a
-lib/gcc/avr/4.1.0/avr5/libgcov.a
-lib/gcc/avr/4.1.0/include/README
-lib/gcc/avr/4.1.0/include/fixed
-lib/gcc/avr/4.1.0/include/float.h
-lib/gcc/avr/4.1.0/include/iso646.h
-lib/gcc/avr/4.1.0/include/limits.h
-lib/gcc/avr/4.1.0/include/stdarg.h
-lib/gcc/avr/4.1.0/include/stdbool.h
-lib/gcc/avr/4.1.0/include/stddef.h
-lib/gcc/avr/4.1.0/include/syslimits.h
-lib/gcc/avr/4.1.0/include/unwind.h
-lib/gcc/avr/4.1.0/include/varargs.h
-lib/gcc/avr/4.1.0/install-tools/gsyslimits.h
-lib/gcc/avr/4.1.0/install-tools/include/README
-lib/gcc/avr/4.1.0/install-tools/include/float.h
-lib/gcc/avr/4.1.0/install-tools/include/iso646.h
-lib/gcc/avr/4.1.0/install-tools/include/limits.h
-lib/gcc/avr/4.1.0/install-tools/include/stdarg.h
-lib/gcc/avr/4.1.0/install-tools/include/stdbool.h
-lib/gcc/avr/4.1.0/install-tools/include/stddef.h
-lib/gcc/avr/4.1.0/install-tools/include/unwind.h
-lib/gcc/avr/4.1.0/install-tools/include/varargs.h
-lib/gcc/avr/4.1.0/install-tools/macro_list
-lib/gcc/avr/4.1.0/install-tools/mkheaders.conf
-lib/gcc/avr/4.1.0/libgcc.a
-lib/gcc/avr/4.1.0/libgcov.a
-libexec/gcc/avr/4.1.0/cc1
-libexec/gcc/avr/4.1.0/cc1plus
-libexec/gcc/avr/4.1.0/collect2
-libexec/gcc/avr/4.1.0/install-tools/fix-header
-libexec/gcc/avr/4.1.0/install-tools/fixinc.sh
-libexec/gcc/avr/4.1.0/install-tools/fixincl
-libexec/gcc/avr/4.1.0/install-tools/fixproto
-libexec/gcc/avr/4.1.0/install-tools/mkheaders
+lib/gcc/avr/4.1.1/avr3/libgcc.a
+lib/gcc/avr/4.1.1/avr3/libgcov.a
+lib/gcc/avr/4.1.1/avr4/libgcc.a
+lib/gcc/avr/4.1.1/avr4/libgcov.a
+lib/gcc/avr/4.1.1/avr5/libgcc.a
+lib/gcc/avr/4.1.1/avr5/libgcov.a
+lib/gcc/avr/4.1.1/avr6/libgcc.a
+lib/gcc/avr/4.1.1/avr6/libgcov.a
+lib/gcc/avr/4.1.1/include/README
+lib/gcc/avr/4.1.1/include/fixed
+lib/gcc/avr/4.1.1/include/float.h
+lib/gcc/avr/4.1.1/include/iso646.h
+lib/gcc/avr/4.1.1/include/limits.h
+lib/gcc/avr/4.1.1/include/stdarg.h
+lib/gcc/avr/4.1.1/include/stdbool.h
+lib/gcc/avr/4.1.1/include/stddef.h
+lib/gcc/avr/4.1.1/include/syslimits.h
+lib/gcc/avr/4.1.1/include/unwind.h
+lib/gcc/avr/4.1.1/include/varargs.h
+lib/gcc/avr/4.1.1/install-tools/gsyslimits.h
+lib/gcc/avr/4.1.1/install-tools/include/README
+lib/gcc/avr/4.1.1/install-tools/include/float.h
+lib/gcc/avr/4.1.1/install-tools/include/iso646.h
+lib/gcc/avr/4.1.1/install-tools/include/limits.h
+lib/gcc/avr/4.1.1/install-tools/include/stdarg.h
+lib/gcc/avr/4.1.1/install-tools/include/stdbool.h
+lib/gcc/avr/4.1.1/install-tools/include/stddef.h
+lib/gcc/avr/4.1.1/install-tools/include/unwind.h
+lib/gcc/avr/4.1.1/install-tools/include/varargs.h
+lib/gcc/avr/4.1.1/install-tools/macro_list
+lib/gcc/avr/4.1.1/install-tools/mkheaders.conf
+lib/gcc/avr/4.1.1/libgcc.a
+lib/gcc/avr/4.1.1/libgcov.a
+libexec/gcc/avr/4.1.1/cc1
+libexec/gcc/avr/4.1.1/cc1plus
+libexec/gcc/avr/4.1.1/collect2
+libexec/gcc/avr/4.1.1/install-tools/fix-header
+libexec/gcc/avr/4.1.1/install-tools/fixinc.sh
+libexec/gcc/avr/4.1.1/install-tools/fixincl
+libexec/gcc/avr/4.1.1/install-tools/fixproto
+libexec/gcc/avr/4.1.1/install-tools/mkheaders
 share/locale/be/LC_MESSAGES/cpplib.mo
 share/locale/be/LC_MESSAGES/gcc.mo
 share/locale/ca/LC_MESSAGES/cpplib.mo
@@ -73,18 +75,21 @@ share/locale/tr/LC_MESSAGES/gcc.mo
 share/locale/vi/LC_MESSAGES/cpplib.mo
 share/locale/zh_CN/LC_MESSAGES/cpplib.mo
 share/locale/zh_CN/LC_MESSAGES/gcc.mo
+share/locale/zh_TW/LC_MESSAGES/cpplib.mo
+share/locale/zh_TW/LC_MESSAGES/gcc.mo
 @unexec /bin/rmdir %D/share/locale/rw/LC_MESSAGES 2>/dev/null || /usr/bin/true
 @unexec /bin/rmdir %D/share/locale/rw 2>/dev/null || /usr/bin/true
-@dirrm lib/gcc/avr/4.1.0/avr3
-@dirrm lib/gcc/avr/4.1.0/avr4
-@dirrm lib/gcc/avr/4.1.0/avr5
-@dirrm lib/gcc/avr/4.1.0/include
-@dirrm lib/gcc/avr/4.1.0/install-tools/include
-@dirrm lib/gcc/avr/4.1.0/install-tools
-@dirrm lib/gcc/avr/4.1.0
+@dirrm lib/gcc/avr/4.1.1/avr3
+@dirrm lib/gcc/avr/4.1.1/avr4
+@dirrm lib/gcc/avr/4.1.1/avr5
+@dirrm lib/gcc/avr/4.1.1/avr6
+@dirrm lib/gcc/avr/4.1.1/include
+@dirrm lib/gcc/avr/4.1.1/install-tools/include
+@dirrm lib/gcc/avr/4.1.1/install-tools
+@dirrm lib/gcc/avr/4.1.1
 @dirrm lib/gcc/avr
 @dirrm lib/gcc
-@dirrm libexec/gcc/avr/4.1.0/install-tools
-@dirrm libexec/gcc/avr/4.1.0
+@dirrm libexec/gcc/avr/4.1.1/install-tools
+@dirrm libexec/gcc/avr/4.1.1
 @dirrm libexec/gcc/avr
 @dirrm libexec/gcc