From 4df6ca67ac8cf664fb2a1700ecf3225ffed315fa Mon Sep 17 00:00:00 2001 From: Joerg Wunsch Date: Wed, 14 Dec 2005 22:42:16 +0000 Subject: Upgrade to GCC 3.4.5, and add support for ATtiny24/44/84 devices. --- devel/avr-gcc/Makefile | 3 +- devel/avr-gcc/distinfo | 8 +-- devel/avr-gcc/files/patch-newdevices | 33 +++++++----- devel/avr-gcc/pkg-descr | 6 +-- devel/avr-gcc/pkg-plist | 100 +++++++++++++++++------------------ 5 files changed, 77 insertions(+), 73 deletions(-) (limited to 'devel/avr-gcc') diff --git a/devel/avr-gcc/Makefile b/devel/avr-gcc/Makefile index f892b180c6d3..54b79317c9c8 100644 --- a/devel/avr-gcc/Makefile +++ b/devel/avr-gcc/Makefile @@ -6,8 +6,7 @@ # PORTNAME= gcc -PORTVERSION= 3.4.4 -PORTREVISION= 5 +PORTVERSION= 3.4.5 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 46c2109e02d2..ffaa43494d74 100644 --- a/devel/avr-gcc/distinfo +++ b/devel/avr-gcc/distinfo @@ -1,4 +1,4 @@ -MD5 (gcc-core-3.4.4.tar.bz2) = 9dd911fd9bc136ca42b73c68735d853b -SIZE (gcc-core-3.4.4.tar.bz2) = 13153342 -MD5 (gcc-g++-3.4.4.tar.bz2) = a828b7024f07cebc3bc1e55dbfd4706a -SIZE (gcc-g++-3.4.4.tar.bz2) = 2474402 +MD5 (gcc-core-3.4.5.tar.bz2) = 0114ba67f9aabad91d96797d0b6017c4 +SIZE (gcc-core-3.4.5.tar.bz2) = 13397308 +MD5 (gcc-g++-3.4.5.tar.bz2) = 8d51a3255e680f35ef744af0bf595595 +SIZE (gcc-g++-3.4.5.tar.bz2) = 2510819 diff --git a/devel/avr-gcc/files/patch-newdevices b/devel/avr-gcc/files/patch-newdevices index 1455a3a4319b..734e61a092bc 100644 --- a/devel/avr-gcc/files/patch-newdevices +++ b/devel/avr-gcc/files/patch-newdevices @@ -1,20 +1,23 @@ -diff -ur ../gcc-3.4.4-orig/gcc/config/avr/avr.c ./gcc/config/avr/avr.c ---- ../gcc-3.4.4-orig/gcc/config/avr/avr.c Sun Mar 20 22:14:28 2005 -+++ ./gcc/config/avr/avr.c Fri Nov 4 21:20:12 2005 -@@ -175,6 +175,12 @@ +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 @@ { "at90c8534", 2, "__AVR_AT90C8534__" }, { "at90s8535", 2, "__AVR_AT90S8535__" }, { "at86rf401", 2, "__AVR_AT86RF401__" }, + /* Classic + MOVW, <= 8K. */ + { "attiny13", 2, "__AVR_ATtiny13__" }, + { "attiny2313", 2, "__AVR_ATtiny2313__" }, ++ { "attiny24", 2, "__AVR_ATtiny24__" }, ++ { "attiny44", 2, "__AVR_ATtiny44__" }, ++ { "attiny84", 2, "__AVR_ATtiny84__" }, + { "attiny25", 2, "__AVR_ATtiny25__" }, + { "attiny45", 2, "__AVR_ATtiny45__" }, + { "attiny85", 2, "__AVR_ATtiny85__" }, /* Classic, > 8K. */ { "avr3", 3, NULL }, { "atmega103", 3, "__AVR_ATmega103__" }, -@@ -185,19 +191,42 @@ +@@ -185,19 +194,42 @@ /* Enhanced, <= 8K. */ { "avr4", 4, NULL }, { "atmega8", 4, "__AVR_ATmega8__" }, @@ -57,9 +60,9 @@ diff -ur ../gcc-3.4.4-orig/gcc/config/avr/avr.c ./gcc/config/avr/avr.c { "at94k", 5, "__AVR_AT94K__" }, /* Assembler only. */ { "avr1", 1, NULL }, -diff -ur ../gcc-3.4.4-orig/gcc/config/avr/avr.h ./gcc/config/avr/avr.h ---- ../gcc-3.4.4-orig/gcc/config/avr/avr.h Tue Mar 9 03:59:55 2004 -+++ ./gcc/config/avr/avr.h Fri Nov 4 21:21:30 2005 +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 @@ -2351,12 +2351,13 @@ Do not define this macro if it does not need to do anything. */ @@ -67,7 +70,7 @@ diff -ur ../gcc-3.4.4-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=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:-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}\ @@ -97,12 +100,15 @@ diff -ur ../gcc-3.4.4-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,51 @@ +@@ -2421,23 +2422,54 @@ %{mmcu=at90c8534:crtc8534.o%s} \ %{mmcu=at90s8535:crts8535.o%s} \ %{mmcu=at86rf401:crt86401.o%s} \ +%{mmcu=attiny13:crttn13.o%s} \ +%{mmcu=attiny2313:crttn2313.o%s} \ ++%{mmcu=attiny24:crttn24.o%s} \ ++%{mmcu=attiny44:crttn44.o%s} \ ++%{mmcu=attiny84:crttn84.o%s} \ +%{mmcu=attiny25:crttn25.o%s} \ +%{mmcu=attiny45:crttn45.o%s} \ +%{mmcu=attiny85:crttn85.o%s} \ @@ -149,9 +155,9 @@ diff -ur ../gcc-3.4.4-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-3.4.4-orig/gcc/config/avr/t-avr ./gcc/config/avr/t-avr ---- ../gcc-3.4.4-orig/gcc/config/avr/t-avr Mon Apr 25 06:17:34 2005 -+++ ./gcc/config/avr/t-avr Fri Nov 4 21:22:34 2005 +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 @@ -46,12 +46,27 @@ mmcu?avr3=mmcu?at43usb320 mmcu?avr3=mmcu?at43usb355 \ mmcu?avr3=mmcu?at76c711 \ @@ -184,4 +190,3 @@ diff -ur ../gcc-3.4.4-orig/gcc/config/avr/t-avr ./gcc/config/avr/t-avr mmcu?avr5=mmcu?at94k MULTILIB_EXCEPTIONS = - diff --git a/devel/avr-gcc/pkg-descr b/devel/avr-gcc/pkg-descr index 8a01f937fc2b..fdb759b14332 100644 --- a/devel/avr-gcc/pkg-descr +++ b/devel/avr-gcc/pkg-descr @@ -11,12 +11,12 @@ Locally hack added: recognizes 0bXXX binary constants Locally added support for the following AVR devices: - ATtiny13/ATtiny2313 ATtiny25/ATtiny45/ATtiny85 - ATmega48/ATmega88/ATmega168 AT90PWM2/AT90PWM3 + ATtiny13/ATtiny2313 ATtiny24/ATtiny44/ATtiny84 + ATmega48/ATmega88/ATmega168 ATtiny25/ATtiny45/ATtiny85 ATmega164/ATmega324/ATmega644 ATmega165 ATmega325/ATmega3250/ATmega645/ATmega6450 ATmega329/ATmega3290/ATmega649/ATmega6490 - ATmega640/ATmega1280/ATmega1281 + ATmega640/ATmega1280/ATmega1281 AT90PWM2/AT90PWM3 AT90CAN32/64/128 WWW: http://gcc.gnu.org/ diff --git a/devel/avr-gcc/pkg-plist b/devel/avr-gcc/pkg-plist index d5964dc522da..eee22c9b0e7a 100644 --- a/devel/avr-gcc/pkg-plist +++ b/devel/avr-gcc/pkg-plist @@ -5,58 +5,58 @@ bin/avr-c++ bin/avr-cpp bin/avr-g++ bin/avr-gcc -bin/avr-gcc-3.4.4 +bin/avr-gcc-3.4.5 bin/avr-gccbug -lib/gcc/avr/3.4.4/avr3/libgcc.a -lib/gcc/avr/3.4.4/avr3/libgcov.a -lib/gcc/avr/3.4.4/avr4/libgcc.a -lib/gcc/avr/3.4.4/avr4/libgcov.a -lib/gcc/avr/3.4.4/avr5/libgcc.a -lib/gcc/avr/3.4.4/avr5/libgcov.a -lib/gcc/avr/3.4.4/include/README -lib/gcc/avr/3.4.4/include/fixed -lib/gcc/avr/3.4.4/include/float.h -lib/gcc/avr/3.4.4/include/iso646.h -lib/gcc/avr/3.4.4/include/limits.h -lib/gcc/avr/3.4.4/include/stdarg.h -lib/gcc/avr/3.4.4/include/stdbool.h -lib/gcc/avr/3.4.4/include/stddef.h -lib/gcc/avr/3.4.4/include/syslimits.h -lib/gcc/avr/3.4.4/include/unwind.h -lib/gcc/avr/3.4.4/include/varargs.h -lib/gcc/avr/3.4.4/install-tools/gsyslimits.h -lib/gcc/avr/3.4.4/install-tools/include/README -lib/gcc/avr/3.4.4/install-tools/include/float.h -lib/gcc/avr/3.4.4/install-tools/include/iso646.h -lib/gcc/avr/3.4.4/install-tools/include/limits.h -lib/gcc/avr/3.4.4/install-tools/include/stdarg.h -lib/gcc/avr/3.4.4/install-tools/include/stdbool.h -lib/gcc/avr/3.4.4/install-tools/include/stddef.h -lib/gcc/avr/3.4.4/install-tools/include/unwind.h -lib/gcc/avr/3.4.4/install-tools/include/varargs.h -lib/gcc/avr/3.4.4/install-tools/mkheaders.conf -lib/gcc/avr/3.4.4/libgcc.a -lib/gcc/avr/3.4.4/libgcov.a -lib/gcc/avr/3.4.4/specs -libexec/gcc/avr/3.4.4/cc1 -libexec/gcc/avr/3.4.4/cc1plus -libexec/gcc/avr/3.4.4/collect2 -libexec/gcc/avr/3.4.4/install-tools/fix-header -libexec/gcc/avr/3.4.4/install-tools/fixinc.sh -libexec/gcc/avr/3.4.4/install-tools/fixincl -libexec/gcc/avr/3.4.4/install-tools/fixproto -libexec/gcc/avr/3.4.4/install-tools/mkheaders -libexec/gcc/avr/3.4.4/install-tools/mkinstalldirs -@dirrm lib/gcc/avr/3.4.4/avr3 -@dirrm lib/gcc/avr/3.4.4/avr4 -@dirrm lib/gcc/avr/3.4.4/avr5 -@dirrm lib/gcc/avr/3.4.4/include -@dirrm lib/gcc/avr/3.4.4/install-tools/include -@dirrm lib/gcc/avr/3.4.4/install-tools -@dirrm lib/gcc/avr/3.4.4 +lib/gcc/avr/3.4.5/avr3/libgcc.a +lib/gcc/avr/3.4.5/avr3/libgcov.a +lib/gcc/avr/3.4.5/avr4/libgcc.a +lib/gcc/avr/3.4.5/avr4/libgcov.a +lib/gcc/avr/3.4.5/avr5/libgcc.a +lib/gcc/avr/3.4.5/avr5/libgcov.a +lib/gcc/avr/3.4.5/include/README +lib/gcc/avr/3.4.5/include/fixed +lib/gcc/avr/3.4.5/include/float.h +lib/gcc/avr/3.4.5/include/iso646.h +lib/gcc/avr/3.4.5/include/limits.h +lib/gcc/avr/3.4.5/include/stdarg.h +lib/gcc/avr/3.4.5/include/stdbool.h +lib/gcc/avr/3.4.5/include/stddef.h +lib/gcc/avr/3.4.5/include/syslimits.h +lib/gcc/avr/3.4.5/include/unwind.h +lib/gcc/avr/3.4.5/include/varargs.h +lib/gcc/avr/3.4.5/install-tools/gsyslimits.h +lib/gcc/avr/3.4.5/install-tools/include/README +lib/gcc/avr/3.4.5/install-tools/include/float.h +lib/gcc/avr/3.4.5/install-tools/include/iso646.h +lib/gcc/avr/3.4.5/install-tools/include/limits.h +lib/gcc/avr/3.4.5/install-tools/include/stdarg.h +lib/gcc/avr/3.4.5/install-tools/include/stdbool.h +lib/gcc/avr/3.4.5/install-tools/include/stddef.h +lib/gcc/avr/3.4.5/install-tools/include/unwind.h +lib/gcc/avr/3.4.5/install-tools/include/varargs.h +lib/gcc/avr/3.4.5/install-tools/mkheaders.conf +lib/gcc/avr/3.4.5/libgcc.a +lib/gcc/avr/3.4.5/libgcov.a +lib/gcc/avr/3.4.5/specs +libexec/gcc/avr/3.4.5/cc1 +libexec/gcc/avr/3.4.5/cc1plus +libexec/gcc/avr/3.4.5/collect2 +libexec/gcc/avr/3.4.5/install-tools/fix-header +libexec/gcc/avr/3.4.5/install-tools/fixinc.sh +libexec/gcc/avr/3.4.5/install-tools/fixincl +libexec/gcc/avr/3.4.5/install-tools/fixproto +libexec/gcc/avr/3.4.5/install-tools/mkheaders +libexec/gcc/avr/3.4.5/install-tools/mkinstalldirs +@dirrm lib/gcc/avr/3.4.5/avr3 +@dirrm lib/gcc/avr/3.4.5/avr4 +@dirrm lib/gcc/avr/3.4.5/avr5 +@dirrm lib/gcc/avr/3.4.5/include +@dirrm lib/gcc/avr/3.4.5/install-tools/include +@dirrm lib/gcc/avr/3.4.5/install-tools +@dirrm lib/gcc/avr/3.4.5 @dirrm lib/gcc/avr @dirrm lib/gcc -@dirrm libexec/gcc/avr/3.4.4/install-tools -@dirrm libexec/gcc/avr/3.4.4 +@dirrm libexec/gcc/avr/3.4.5/install-tools +@dirrm libexec/gcc/avr/3.4.5 @dirrm libexec/gcc/avr @dirrm libexec/gcc -- cgit v1.2.3