aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--devel/avr-binutils/Makefile2
-rw-r--r--devel/avr-binutils/files/patch-newdevices13
-rw-r--r--devel/avr-binutils/pkg-descr1
-rw-r--r--devel/avr-gcc-3/Makefile1
-rw-r--r--devel/avr-gcc-3/files/patch-newdevices24
-rw-r--r--devel/avr-gcc-3/pkg-descr3
-rw-r--r--devel/avr-gcc/Makefile1
-rw-r--r--devel/avr-gcc/files/patch-newdevices24
-rw-r--r--devel/avr-gcc/pkg-descr3
9 files changed, 47 insertions, 25 deletions
diff --git a/devel/avr-binutils/Makefile b/devel/avr-binutils/Makefile
index 4a259642c1f5..66d13681e6a5 100644
--- a/devel/avr-binutils/Makefile
+++ b/devel/avr-binutils/Makefile
@@ -7,7 +7,7 @@
PORTNAME= binutils
PORTVERSION= 2.16.1
-PORTREVISION= 1
+PORTREVISION= 2
CATEGORIES= devel
MASTER_SITES= ${MASTER_SITE_SOURCEWARE}
MASTER_SITE_SUBDIR= binutils/releases
diff --git a/devel/avr-binutils/files/patch-newdevices b/devel/avr-binutils/files/patch-newdevices
index 398f14cfe1b6..54932a0580d5 100644
--- a/devel/avr-binutils/files/patch-newdevices
+++ b/devel/avr-binutils/files/patch-newdevices
@@ -1,10 +1,13 @@
diff -ur ../binutils-2.16.1.orig/gas/config/tc-avr.c ./gas/config/tc-avr.c
--- ../binutils-2.16.1.orig/gas/config/tc-avr.c Wed Feb 23 13:28:04 2005
-+++ ./gas/config/tc-avr.c Wed Dec 14 22:35:33 2005
-@@ -88,6 +88,12 @@
++++ ./gas/config/tc-avr.c Wed Jan 4 22:10:33 2006
+@@ -88,6 +88,15 @@
{"at86rf401", AVR_ISA_2xxx, bfd_mach_avr2},
{"attiny13", AVR_ISA_TINY2, bfd_mach_avr2},
{"attiny2313",AVR_ISA_TINY2, bfd_mach_avr2},
++ {"attiny261", AVR_ISA_TINY2, bfd_mach_avr2},
++ {"attiny461", AVR_ISA_TINY2, bfd_mach_avr2},
++ {"attiny861", AVR_ISA_TINY2, bfd_mach_avr2},
+ {"attiny24", AVR_ISA_TINY2, bfd_mach_avr2},
+ {"attiny44", AVR_ISA_TINY2, bfd_mach_avr2},
+ {"attiny84", AVR_ISA_TINY2, bfd_mach_avr2},
@@ -14,7 +17,7 @@ diff -ur ../binutils-2.16.1.orig/gas/config/tc-avr.c ./gas/config/tc-avr.c
{"atmega603", AVR_ISA_M603, bfd_mach_avr3}, /* XXX -> m103 */
{"atmega103", AVR_ISA_M103, bfd_mach_avr3},
{"at43usb320",AVR_ISA_M103, bfd_mach_avr3},
-@@ -100,21 +106,35 @@
+@@ -100,21 +109,35 @@
{"atmega88", AVR_ISA_M8, bfd_mach_avr4},
{"atmega8515",AVR_ISA_M8, bfd_mach_avr4},
{"atmega8535",AVR_ISA_M8, bfd_mach_avr4},
@@ -50,9 +53,10 @@ diff -ur ../binutils-2.16.1.orig/gas/config/tc-avr.c ./gas/config/tc-avr.c
{"at90can128",AVR_ISA_M128, bfd_mach_avr5},
{"at94k", AVR_ISA_94K, bfd_mach_avr5},
{NULL, 0, 0}
+Only in ./gas/config: tc-avr.c.orig
diff -ur ../binutils-2.16.1.orig/include/opcode/avr.h ./include/opcode/avr.h
--- ../binutils-2.16.1.orig/include/opcode/avr.h Thu Mar 3 12:58:09 2005
-+++ ./include/opcode/avr.h Wed Dec 14 22:34:19 2005
++++ ./include/opcode/avr.h Wed Jan 4 22:09:48 2006
@@ -37,6 +37,7 @@
AVR_ISA_SPM | AVR_ISA_BRK)
#define AVR_ISA_M8 (AVR_ISA_2xxx | AVR_ISA_MUL | AVR_ISA_MOVW | \
@@ -61,3 +65,4 @@ diff -ur ../binutils-2.16.1.orig/include/opcode/avr.h ./include/opcode/avr.h
#define AVR_ISA_M603 (AVR_ISA_2xxx | AVR_ISA_MEGA)
#define AVR_ISA_M103 (AVR_ISA_M603 | AVR_ISA_ELPM)
#define AVR_ISA_M161 (AVR_ISA_M603 | AVR_ISA_MUL | AVR_ISA_MOVW | \
+Only in ./include/opcode: avr.h.orig
diff --git a/devel/avr-binutils/pkg-descr b/devel/avr-binutils/pkg-descr
index ddd466bffb2f..2eb951c6eb57 100644
--- a/devel/avr-binutils/pkg-descr
+++ b/devel/avr-binutils/pkg-descr
@@ -12,6 +12,7 @@ following AVR devices has been added by a private patch:
ATtiny24/44/84
ATtiny25/45/85
+ ATtiny261/461/861
AT90PWM2/3
ATmega164/324/644
ATmega329/3290/649/6490
diff --git a/devel/avr-gcc-3/Makefile b/devel/avr-gcc-3/Makefile
index 54b79317c9c8..741e916da3b4 100644
--- a/devel/avr-gcc-3/Makefile
+++ b/devel/avr-gcc-3/Makefile
@@ -7,6 +7,7 @@
PORTNAME= gcc
PORTVERSION= 3.4.5
+PORTREVISION= 1
CATEGORIES= devel
MASTER_SITES= ${MASTER_SITE_GCC}
MASTER_SITES+= http://people.freebsd.org/~joerg/:local
diff --git a/devel/avr-gcc-3/files/patch-newdevices b/devel/avr-gcc-3/files/patch-newdevices
index 734e61a092bc..b034533fb235 100644
--- a/devel/avr-gcc-3/files/patch-newdevices
+++ b/devel/avr-gcc-3/files/patch-newdevices
@@ -1,10 +1,13 @@
diff -ur ../gcc-3.4.5.orig/gcc/config/avr/avr.c ./gcc/config/avr/avr.c
---- ../gcc-3.4.5.orig/gcc/config/avr/avr.c Wed Dec 14 23:11:50 2005
-+++ ./gcc/config/avr/avr.c Wed Dec 14 23:14:22 2005
-@@ -175,6 +175,15 @@
+--- ../gcc-3.4.5.orig/gcc/config/avr/avr.c Wed Jan 4 22:38:40 2006
++++ ./gcc/config/avr/avr.c Wed Jan 4 22:44:07 2006
+@@ -175,6 +175,18 @@
{ "at90c8534", 2, "__AVR_AT90C8534__" },
{ "at90s8535", 2, "__AVR_AT90S8535__" },
{ "at86rf401", 2, "__AVR_AT86RF401__" },
++ { "attiny261", 2, "__AVR_ATtiny261__" },
++ { "attiny461", 2, "__AVR_ATtiny461__" },
++ { "attiny861", 2, "__AVR_ATtiny861__" },
+ /* Classic + MOVW, <= 8K. */
+ { "attiny13", 2, "__AVR_ATtiny13__" },
+ { "attiny2313", 2, "__AVR_ATtiny2313__" },
@@ -17,7 +20,7 @@ diff -ur ../gcc-3.4.5.orig/gcc/config/avr/avr.c ./gcc/config/avr/avr.c
/* Classic, > 8K. */
{ "avr3", 3, NULL },
{ "atmega103", 3, "__AVR_ATmega103__" },
-@@ -185,19 +194,42 @@
+@@ -185,19 +197,42 @@
/* Enhanced, <= 8K. */
{ "avr4", 4, NULL },
{ "atmega8", 4, "__AVR_ATmega8__" },
@@ -61,8 +64,8 @@ diff -ur ../gcc-3.4.5.orig/gcc/config/avr/avr.c ./gcc/config/avr/avr.c
/* Assembler only. */
{ "avr1", 1, NULL },
diff -ur ../gcc-3.4.5.orig/gcc/config/avr/avr.h ./gcc/config/avr/avr.h
---- ../gcc-3.4.5.orig/gcc/config/avr/avr.h Wed Dec 14 23:11:46 2005
-+++ ./gcc/config/avr/avr.h Wed Dec 14 23:15:30 2005
+--- ../gcc-3.4.5.orig/gcc/config/avr/avr.h Wed Jan 4 22:38:36 2006
++++ ./gcc/config/avr/avr.h Wed Jan 4 22:45:00 2006
@@ -2351,12 +2351,13 @@
Do not define this macro if it does not need to do anything. */
@@ -70,7 +73,7 @@ diff -ur ../gcc-3.4.5.orig/gcc/config/avr/avr.h ./gcc/config/avr/avr.h
-%{mmcu=at90s1200|mmcu=attiny1*|mmcu=attiny28:-m avr1} \
-%{mmcu=attiny22|mmcu=attiny26|mmcu=at90s2*|mmcu=at90s4*|mmcu=at90s8*|mmcu=at90c8*|mmcu=at86rf401:-m avr2}\
+%{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=attiny44|mmcu=attiny84|mmcu=attiny25|mmcu=attiny45|mmcu=attiny85:-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=atmega8*:-m avr4}\
-%{mmcu=atmega16*|mmcu=atmega32*|mmcu=atmega64|mmcu=atmega128|mmcu=at94k:-m avr5}\
@@ -100,7 +103,7 @@ diff -ur ../gcc-3.4.5.orig/gcc/config/avr/avr.h ./gcc/config/avr/avr.h
/* Another C string constant that tells the GCC driver program how
and when to place a reference to `libgcc.a' into the linker
command line. This constant is placed both before and after the
-@@ -2421,23 +2422,54 @@
+@@ -2421,23 +2422,57 @@
%{mmcu=at90c8534:crtc8534.o%s} \
%{mmcu=at90s8535:crts8535.o%s} \
%{mmcu=at86rf401:crt86401.o%s} \
@@ -112,6 +115,9 @@ diff -ur ../gcc-3.4.5.orig/gcc/config/avr/avr.h ./gcc/config/avr/avr.h
+%{mmcu=attiny25:crttn25.o%s} \
+%{mmcu=attiny45:crttn45.o%s} \
+%{mmcu=attiny85:crttn85.o%s} \
++%{mmcu=attiny261:crttn261.o%s} \
++%{mmcu=attiny461:crttn461.o%s} \
++%{mmcu=attiny861:crttn861.o%s} \
%{mmcu=atmega103|mmcu=avr3:crtm103.o%s} \
%{mmcu=atmega603:crtm603.o%s} \
%{mmcu=at43usb320:crt43320.o%s} \
@@ -157,7 +163,7 @@ diff -ur ../gcc-3.4.5.orig/gcc/config/avr/avr.h ./gcc/config/avr/avr.h
#define EXTRA_SPECS {"crt_binutils", CRT_BINUTILS_SPECS},
diff -ur ../gcc-3.4.5.orig/gcc/config/avr/t-avr ./gcc/config/avr/t-avr
--- ../gcc-3.4.5.orig/gcc/config/avr/t-avr Mon Apr 25 06:17:34 2005
-+++ ./gcc/config/avr/t-avr Wed Dec 14 23:13:03 2005
++++ ./gcc/config/avr/t-avr Wed Jan 4 22:43:26 2006
@@ -46,12 +46,27 @@
mmcu?avr3=mmcu?at43usb320 mmcu?avr3=mmcu?at43usb355 \
mmcu?avr3=mmcu?at76c711 \
diff --git a/devel/avr-gcc-3/pkg-descr b/devel/avr-gcc-3/pkg-descr
index fdb759b14332..bfa484c5cf92 100644
--- a/devel/avr-gcc-3/pkg-descr
+++ b/devel/avr-gcc-3/pkg-descr
@@ -12,7 +12,8 @@ Locally hack added: recognizes 0bXXX binary constants
Locally added support for the following AVR devices:
ATtiny13/ATtiny2313 ATtiny24/ATtiny44/ATtiny84
- ATmega48/ATmega88/ATmega168 ATtiny25/ATtiny45/ATtiny85
+ ATtiny25/ATtiny45/ATtiny85 ATtiny261/ATtiny461/ATtiny861
+ ATmega48/ATmega88/ATmega168
ATmega164/ATmega324/ATmega644 ATmega165
ATmega325/ATmega3250/ATmega645/ATmega6450
ATmega329/ATmega3290/ATmega649/ATmega6490
diff --git a/devel/avr-gcc/Makefile b/devel/avr-gcc/Makefile
index 54b79317c9c8..741e916da3b4 100644
--- a/devel/avr-gcc/Makefile
+++ b/devel/avr-gcc/Makefile
@@ -7,6 +7,7 @@
PORTNAME= gcc
PORTVERSION= 3.4.5
+PORTREVISION= 1
CATEGORIES= devel
MASTER_SITES= ${MASTER_SITE_GCC}
MASTER_SITES+= http://people.freebsd.org/~joerg/:local
diff --git a/devel/avr-gcc/files/patch-newdevices b/devel/avr-gcc/files/patch-newdevices
index 734e61a092bc..b034533fb235 100644
--- a/devel/avr-gcc/files/patch-newdevices
+++ b/devel/avr-gcc/files/patch-newdevices
@@ -1,10 +1,13 @@
diff -ur ../gcc-3.4.5.orig/gcc/config/avr/avr.c ./gcc/config/avr/avr.c
---- ../gcc-3.4.5.orig/gcc/config/avr/avr.c Wed Dec 14 23:11:50 2005
-+++ ./gcc/config/avr/avr.c Wed Dec 14 23:14:22 2005
-@@ -175,6 +175,15 @@
+--- ../gcc-3.4.5.orig/gcc/config/avr/avr.c Wed Jan 4 22:38:40 2006
++++ ./gcc/config/avr/avr.c Wed Jan 4 22:44:07 2006
+@@ -175,6 +175,18 @@
{ "at90c8534", 2, "__AVR_AT90C8534__" },
{ "at90s8535", 2, "__AVR_AT90S8535__" },
{ "at86rf401", 2, "__AVR_AT86RF401__" },
++ { "attiny261", 2, "__AVR_ATtiny261__" },
++ { "attiny461", 2, "__AVR_ATtiny461__" },
++ { "attiny861", 2, "__AVR_ATtiny861__" },
+ /* Classic + MOVW, <= 8K. */
+ { "attiny13", 2, "__AVR_ATtiny13__" },
+ { "attiny2313", 2, "__AVR_ATtiny2313__" },
@@ -17,7 +20,7 @@ diff -ur ../gcc-3.4.5.orig/gcc/config/avr/avr.c ./gcc/config/avr/avr.c
/* Classic, > 8K. */
{ "avr3", 3, NULL },
{ "atmega103", 3, "__AVR_ATmega103__" },
-@@ -185,19 +194,42 @@
+@@ -185,19 +197,42 @@
/* Enhanced, <= 8K. */
{ "avr4", 4, NULL },
{ "atmega8", 4, "__AVR_ATmega8__" },
@@ -61,8 +64,8 @@ diff -ur ../gcc-3.4.5.orig/gcc/config/avr/avr.c ./gcc/config/avr/avr.c
/* Assembler only. */
{ "avr1", 1, NULL },
diff -ur ../gcc-3.4.5.orig/gcc/config/avr/avr.h ./gcc/config/avr/avr.h
---- ../gcc-3.4.5.orig/gcc/config/avr/avr.h Wed Dec 14 23:11:46 2005
-+++ ./gcc/config/avr/avr.h Wed Dec 14 23:15:30 2005
+--- ../gcc-3.4.5.orig/gcc/config/avr/avr.h Wed Jan 4 22:38:36 2006
++++ ./gcc/config/avr/avr.h Wed Jan 4 22:45:00 2006
@@ -2351,12 +2351,13 @@
Do not define this macro if it does not need to do anything. */
@@ -70,7 +73,7 @@ diff -ur ../gcc-3.4.5.orig/gcc/config/avr/avr.h ./gcc/config/avr/avr.h
-%{mmcu=at90s1200|mmcu=attiny1*|mmcu=attiny28:-m avr1} \
-%{mmcu=attiny22|mmcu=attiny26|mmcu=at90s2*|mmcu=at90s4*|mmcu=at90s8*|mmcu=at90c8*|mmcu=at86rf401:-m avr2}\
+%{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=attiny44|mmcu=attiny84|mmcu=attiny25|mmcu=attiny45|mmcu=attiny85:-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=atmega8*:-m avr4}\
-%{mmcu=atmega16*|mmcu=atmega32*|mmcu=atmega64|mmcu=atmega128|mmcu=at94k:-m avr5}\
@@ -100,7 +103,7 @@ diff -ur ../gcc-3.4.5.orig/gcc/config/avr/avr.h ./gcc/config/avr/avr.h
/* Another C string constant that tells the GCC driver program how
and when to place a reference to `libgcc.a' into the linker
command line. This constant is placed both before and after the
-@@ -2421,23 +2422,54 @@
+@@ -2421,23 +2422,57 @@
%{mmcu=at90c8534:crtc8534.o%s} \
%{mmcu=at90s8535:crts8535.o%s} \
%{mmcu=at86rf401:crt86401.o%s} \
@@ -112,6 +115,9 @@ diff -ur ../gcc-3.4.5.orig/gcc/config/avr/avr.h ./gcc/config/avr/avr.h
+%{mmcu=attiny25:crttn25.o%s} \
+%{mmcu=attiny45:crttn45.o%s} \
+%{mmcu=attiny85:crttn85.o%s} \
++%{mmcu=attiny261:crttn261.o%s} \
++%{mmcu=attiny461:crttn461.o%s} \
++%{mmcu=attiny861:crttn861.o%s} \
%{mmcu=atmega103|mmcu=avr3:crtm103.o%s} \
%{mmcu=atmega603:crtm603.o%s} \
%{mmcu=at43usb320:crt43320.o%s} \
@@ -157,7 +163,7 @@ diff -ur ../gcc-3.4.5.orig/gcc/config/avr/avr.h ./gcc/config/avr/avr.h
#define EXTRA_SPECS {"crt_binutils", CRT_BINUTILS_SPECS},
diff -ur ../gcc-3.4.5.orig/gcc/config/avr/t-avr ./gcc/config/avr/t-avr
--- ../gcc-3.4.5.orig/gcc/config/avr/t-avr Mon Apr 25 06:17:34 2005
-+++ ./gcc/config/avr/t-avr Wed Dec 14 23:13:03 2005
++++ ./gcc/config/avr/t-avr Wed Jan 4 22:43:26 2006
@@ -46,12 +46,27 @@
mmcu?avr3=mmcu?at43usb320 mmcu?avr3=mmcu?at43usb355 \
mmcu?avr3=mmcu?at76c711 \
diff --git a/devel/avr-gcc/pkg-descr b/devel/avr-gcc/pkg-descr
index fdb759b14332..bfa484c5cf92 100644
--- a/devel/avr-gcc/pkg-descr
+++ b/devel/avr-gcc/pkg-descr
@@ -12,7 +12,8 @@ Locally hack added: recognizes 0bXXX binary constants
Locally added support for the following AVR devices:
ATtiny13/ATtiny2313 ATtiny24/ATtiny44/ATtiny84
- ATmega48/ATmega88/ATmega168 ATtiny25/ATtiny45/ATtiny85
+ ATtiny25/ATtiny45/ATtiny85 ATtiny261/ATtiny461/ATtiny861
+ ATmega48/ATmega88/ATmega168
ATmega164/ATmega324/ATmega644 ATmega165
ATmega325/ATmega3250/ATmega645/ATmega6450
ATmega329/ATmega3290/ATmega649/ATmega6490