sync/ports
1
0
Fork 0
mirror of https://git.freebsd.org/ports.git synced 2025-07-18 01:39:16 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions

Upgrade to GCC 4.2.2

Browse source
This commit is contained in:
Joerg Wunsch 2007-10-28 10:01:30 +00:00
parent 163be42a75
commit d9ba8c2135
Notes: svn2git 2021-03-31 03:12:20 +00:00 
svn path=/head/; revision=202207
7 changed files with 431 additions and 670 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
devel/avr-gcc/Makefile
View file

@ -6,8 +6,7 @@
#
PORTNAME= gcc
PORTVERSION= 4.1.2
PORTREVISION= 4
PORTVERSION= 4.2.2
CATEGORIES= devel
MASTER_SITES= ${MASTER_SITE_GCC}
MASTER_SITES+= http://people.freebsd.org/~joerg/:local

12
devel/avr-gcc/distinfo
View file

@ -1,6 +1,6 @@
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
MD5 (gcc-core-4.2.2.tar.bz2) = b02a013580a9555c7c8f2ca554c02722
SHA256 (gcc-core-4.2.2.tar.bz2) = 0aa0e8855ed2a18557116da97a3786b753e8f117024c974a78bf8b1a49e30d06
SIZE (gcc-core-4.2.2.tar.bz2) = 19104360
MD5 (gcc-g++-4.2.2.tar.bz2) = 1aa75e06ca16518f16d5df67ba98a392
SHA256 (gcc-g++-4.2.2.tar.bz2) = b83e6f847fe30ceea9d91fc09fde4aa5b735b8810967b4df7e24ae11fbb4aa13
SIZE (gcc-g++-4.2.2.tar.bz2) = 4795086

11
devel/avr-gcc/files/patch-attribute_alias
View file

@ -1,11 +0,0 @@
--- 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 \
{ \

476
devel/avr-gcc/files/patch-newdevices
View file

@ -1,307 +1,209 @@
--- gcc/config/avr/avr.c.orig Thu Jul 28 00:29:46 2005
+++ gcc/config/avr/avr.c Mon May 14 07:18:20 2007
@@ -169,10 +169,19 @@
{ "at90s8515", 2, "__AVR_AT90S8515__" },
{ "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__" },
+ { "attiny261", 2, "__AVR_ATtiny261__" },
+ { "attiny461", 2, "__AVR_ATtiny461__" },
+ { "attiny861", 2, "__AVR_ATtiny861__" },
+ { "at86rf401", 2, "__AVR_AT86RF401__" },
--- gcc/config/avr/avr.c.orig Sat Sep 1 17:28:30 2007
+++ gcc/config/avr/avr.c Sun Oct 28 00:00:51 2007
@@ -204,6 +204,8 @@
{ "attiny261", ARCH_AVR25, "__AVR_ATtiny261__" },
{ "attiny461", ARCH_AVR25, "__AVR_ATtiny461__" },
{ "attiny861", ARCH_AVR25, "__AVR_ATtiny861__" },
+ { "attiny43u", ARCH_AVR25, "__AVR_ATtiny43U__" },
+ { "attiny48", ARCH_AVR25, "__AVR_ATtiny48__" },
{ "at86rf401", ARCH_AVR25, "__AVR_AT86RF401__" },
/* Classic, > 8K. */
{ "avr3", 3, NULL },
{ "atmega103", 3, "__AVR_ATmega103__" },
@@ -187,24 +196,55 @@
{ "atmega88", 4, "__AVR_ATmega88__" },
{ "atmega8515", 4, "__AVR_ATmega8515__" },
{ "atmega8535", 4, "__AVR_ATmega8535__" },
+ { "atmega8hva", 4, "__AVR_ATmega8HVA__" },
+ { "at90pwm1", 4, "__AVR_AT90PWM1__" },
+ { "at90pwm2", 4, "__AVR_AT90PWM2__" },
+ { "at90pwm3", 4, "__AVR_AT90PWM3__" },
{ "avr3", ARCH_AVR3, NULL },
@@ -216,13 +218,17 @@
{ "avr4", ARCH_AVR4, NULL },
{ "atmega8", ARCH_AVR4, "__AVR_ATmega8__" },
{ "atmega48", ARCH_AVR4, "__AVR_ATmega48__" },
+ { "atmega48p", ARCH_AVR4, "__AVR_ATmega48P__" },
{ "atmega88", ARCH_AVR4, "__AVR_ATmega88__" },
+ { "atmega88p", ARCH_AVR4, "__AVR_ATmega88P__" },
{ "atmega8515", ARCH_AVR4, "__AVR_ATmega8515__" },
{ "atmega8535", ARCH_AVR4, "__AVR_ATmega8535__" },
{ "atmega8hva", ARCH_AVR4, "__AVR_ATmega8HVA__" },
{ "at90pwm1", ARCH_AVR4, "__AVR_AT90PWM1__" },
{ "at90pwm2", ARCH_AVR4, "__AVR_AT90PWM2__" },
+ { "at90pwm2b", ARCH_AVR4, "__AVR_AT90PWM2B__" },
{ "at90pwm3", ARCH_AVR4, "__AVR_AT90PWM3__" },
+ { "at90pwm3b", ARCH_AVR4, "__AVR_AT90PWM3B__" },
/* Enhanced, > 8K. */
{ "avr5", 5, NULL },
{ "atmega16", 5, "__AVR_ATmega16__" },
{ "atmega161", 5, "__AVR_ATmega161__" },
{ "atmega162", 5, "__AVR_ATmega162__" },
{ "atmega163", 5, "__AVR_ATmega163__" },
+ { "atmega164p",5, "__AVR_ATmega164P__" },
{ "atmega165", 5, "__AVR_ATmega165__" },
+ { "atmega165p",5, "__AVR_ATmega165P__" },
{ "atmega168", 5, "__AVR_ATmega168__" },
{ "atmega169", 5, "__AVR_ATmega169__" },
+ { "atmega169p",5, "__AVR_ATmega169P__" },
{ "atmega32", 5, "__AVR_ATmega32__" },
{ "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__" },
+ { "atmega644", 5, "__AVR_ATmega644__" },
+ { "atmega644p",5, "__AVR_ATmega644P__" },
{ "atmega645", 5, "__AVR_ATmega645__" },
{ "atmega6450", 5, "__AVR_ATmega6450__" },
+ { "atmega649", 5, "__AVR_ATmega649__" },
+ { "atmega6490", 5, "__AVR_ATmega6490__" },
{ "atmega128", 5, "__AVR_ATmega128__" },
+ { "atmega1280",5, "__AVR_ATmega1280__" },
+ { "atmega1281",5, "__AVR_ATmega1281__" },
+ { "atmega16hva",5, "__AVR_ATmega16HVA__" },
+ { "at90can32", 5, "__AVR_AT90CAN32__" },
+ { "at90can64", 5, "__AVR_AT90CAN64__" },
+ { "at90usb82", 5, "__AVR_AT90USB82__" },
{ "at90can128", 5, "__AVR_AT90CAN128__" },
+ { "at90usb162", 5, "__AVR_AT90USB162__" },
+ { "at90usb646", 5, "__AVR_AT90USB646__" },
+ { "at90usb647", 5, "__AVR_AT90USB647__" },
+ { "at90usb1286", 5, "__AVR_AT90USB1286__" },
+ { "at90usb1287", 5, "__AVR_AT90USB1287__" },
{ "at94k", 5, "__AVR_AT94K__" },
/* Assembler only. */
{ "avr1", 1, NULL },
--- gcc/config/avr/t-avr.orig Wed Apr 6 07:34:30 2005
+++ gcc/config/avr/t-avr Mon May 14 07:16:32 2007
@@ -42,21 +42,64 @@
# 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 \
{ "avr5", ARCH_AVR5, NULL },
{ "atmega16", ARCH_AVR5, "__AVR_ATmega16__" },
@@ -233,6 +239,7 @@
{ "atmega165", ARCH_AVR5, "__AVR_ATmega165__" },
{ "atmega165p", ARCH_AVR5, "__AVR_ATmega165P__" },
{ "atmega168", ARCH_AVR5, "__AVR_ATmega168__" },
+ { "atmega168p", ARCH_AVR5, "__AVR_ATmega168P__" },
{ "atmega169", ARCH_AVR5, "__AVR_ATmega169__" },
{ "atmega169p", ARCH_AVR5, "__AVR_ATmega169P__" },
{ "atmega32", ARCH_AVR5, "__AVR_ATmega32__" },
@@ -242,6 +249,7 @@
{ "atmega325p", ARCH_AVR5, "__AVR_ATmega325P__" },
{ "atmega3250", ARCH_AVR5, "__AVR_ATmega3250__" },
{ "atmega3250p", ARCH_AVR5, "__AVR_ATmega3250P__" },
+ { "atmega328p", ARCH_AVR5, "__AVR_ATmega328P__" },
{ "atmega329", ARCH_AVR5, "__AVR_ATmega329__" },
{ "atmega329p", ARCH_AVR5, "__AVR_ATmega329P__" },
{ "atmega3290", ARCH_AVR5, "__AVR_ATmega3290__" },
@@ -262,6 +270,8 @@
{ "at90can32", ARCH_AVR5, "__AVR_AT90CAN32__" },
{ "at90can64", ARCH_AVR5, "__AVR_AT90CAN64__" },
{ "at90can128", ARCH_AVR5, "__AVR_AT90CAN128__" },
+ { "at90pwm216", ARCH_AVR5, "__AVR_AT90PWM216__" },
+ { "at90pwm316", ARCH_AVR5, "__AVR_AT90PWM316__" },
{ "at90usb82", ARCH_AVR5, "__AVR_AT90USB82__" },
{ "at90usb162", ARCH_AVR5, "__AVR_AT90USB162__" },
{ "at90usb646", ARCH_AVR5, "__AVR_AT90USB646__" },
--- gcc/config/avr/t-avr.orig Fri Apr 27 22:53:57 2007
+++ gcc/config/avr/t-avr Sun Oct 28 00:00:47 2007
@@ -53,6 +53,8 @@
mmcu?avr25=mmcu?attiny261 \
mmcu?avr25=mmcu?attiny461 \
mmcu?avr25=mmcu?attiny861 \
+ mmcu?avr25=mmcu?attiny43u \
+ mmcu?avr25=mmcu?attiny48 \
mmcu?avr25=mmcu?at86rf401 \
mmcu?avr3=mmcu?atmega103 \
mmcu?avr3=mmcu?atmega603 \
@@ -60,14 +62,18 @@
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?atmega48 \
+ mmcu?avr4=mmcu?atmega48p \
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?atmega8hva \
+ 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 \
+ mmcu?avr5=mmcu?atmega163 \
+ mmcu?avr5=mmcu?atmega164p \
+ mmcu?avr4=mmcu?atmega88p \
mmcu?avr4=mmcu?atmega8hva \
mmcu?avr4=mmcu?at90pwm1 \
mmcu?avr4=mmcu?at90pwm2 \
+ mmcu?avr4=mmcu?at90pwm2b \
mmcu?avr4=mmcu?at90pwm3 \
+ mmcu?avr4=mmcu?at90pwm3b \
mmcu?avr5=mmcu?atmega16 \
mmcu?avr5=mmcu?atmega161 \
mmcu?avr5=mmcu?atmega162 \
@@ -76,6 +82,7 @@
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?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 \
+ 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?atmega16hva \
+ 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 \
+ mmcu?avr5=mmcu?at90usb1287 \
+ mmcu?avr5=mmcu?at94k
MULTILIB_EXCEPTIONS =
--- gcc/config/avr/avr.h.orig Mon May 14 07:12:25 2007
+++ gcc/config/avr/avr.h Mon May 14 07:15:46 2007
@@ -763,12 +763,69 @@
#define ASM_SPEC "%{mmcu=*:-mmcu=%*}"
#define LINK_SPEC " %{!mmcu*:-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:-m avr2}\
-%{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=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=at90pwm*|\
+ mmcu=at90usb82:-m avr4}\
+%{mmcu=atmega16*|\
+ mmcu=atmega32*|\
+ mmcu=atmega406|\
+ mmcu=atmega64*|\
+ mmcu=atmega128*|\
+ mmcu=at90can*|\
+ mmcu=at90usb162|\
+ mmcu=at90usb64*|\
+ mmcu=at90usb128*|\
+ mmcu=at94k:-m avr5}\
+%{mmcu=atmega324*|\
+ mmcu=atmega325*|\
+ mmcu=atmega329*|\
+ 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=atmega8hva|\
+ mmcu=atmega16hva|\
+ 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 }}}}}"
@@ -804,6 +861,15 @@
%{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} \
+%{mmcu=attiny261:crttn261.o%s} \
+%{mmcu=attiny461:crttn461.o%s} \
+%{mmcu=attiny861:crttn861.o%s} \
mmcu?avr5=mmcu?atmega165p \
mmcu?avr5=mmcu?atmega168 \
+ mmcu?avr5=mmcu?atmega168p \
mmcu?avr5=mmcu?atmega169 \
mmcu?avr5=mmcu?atmega169p \
mmcu?avr5=mmcu?atmega32 \
@@ -85,6 +92,7 @@
mmcu?avr5=mmcu?atmega325p \
mmcu?avr5=mmcu?atmega3250 \
mmcu?avr5=mmcu?atmega3250p \
+ mmcu?avr5=mmcu?atmega328p \
mmcu?avr5=mmcu?atmega329 \
mmcu?avr5=mmcu?atmega329p \
mmcu?avr5=mmcu?atmega3290 \
@@ -105,6 +113,8 @@
mmcu?avr5=mmcu?at90can32 \
mmcu?avr5=mmcu?at90can64 \
mmcu?avr5=mmcu?at90can128 \
+ mmcu?avr5=mmcu?at90pwm216 \
+ mmcu?avr5=mmcu?at90pwm316 \
mmcu?avr5=mmcu?at90usb82 \
mmcu?avr5=mmcu?at90usb162 \
mmcu?avr5=mmcu?at90usb646 \
--- gcc/config/avr/avr.h.orig Sat Oct 27 23:39:36 2007
+++ gcc/config/avr/avr.h Sun Oct 28 00:00:34 2007
@@ -763,22 +763,29 @@
mmcu=at43*|\
mmcu=at76*:-m avr3}\
%{mmcu=atmega8*|\
- mmcu=atmega48|\
- mmcu=at90pwm*:-m avr4}\
+ mmcu=atmega48*|\
+ mmcu=at90pwm1|\
+ mmcu=at90pwm2|\
+ mmcu=at90pwm2b|\
+ mmcu=at90pwm3|\
+ mmcu=at90pwm3b:-m avr4}\
%{mmcu=atmega16*|\
mmcu=atmega32*|\
mmcu=atmega406|\
mmcu=atmega64*|\
mmcu=atmega128*|\
mmcu=at90can*|\
+ mmcu=at90pwm216|\
+ mmcu=at90pwm316|\
mmcu=at90usb*|\
mmcu=at94k:-m avr5}\
%{mmcu=atmega324*|\
mmcu=atmega325*|\
+ mmcu=atmega328p|\
mmcu=atmega329*|\
mmcu=atmega406|\
- mmcu=atmega48|\
- mmcu=atmega88|\
+ mmcu=atmega48*|\
+ mmcu=atmega88*|\
mmcu=atmega64|\
mmcu=atmega644*|\
mmcu=atmega645*|\
@@ -787,10 +794,11 @@
mmcu=atmega162|\
mmcu=atmega164*|\
mmcu=atmega165*|\
- mmcu=atmega168|\
+ mmcu=atmega168*|\
mmcu=atmega169*|\
mmcu=atmega8hva|\
mmcu=atmega16hva|\
+ mmcu=attiny48|\
mmcu=at90can*|\
mmcu=at90pwm*|\
mmcu=at90usb*: -Tdata 0x800100}\
@@ -841,6 +849,8 @@
%{mmcu=attiny261:crttn261.o%s} \
%{mmcu=attiny461:crttn461.o%s} \
%{mmcu=attiny861:crttn861.o%s} \
+%{mmcu=attiny43u:crttn43u.o%s} \
+%{mmcu=attiny48:crttn48.o%s} \
%{mmcu=atmega103|mmcu=avr3:crtm103.o%s} \
%{mmcu=atmega603:crtm603.o%s} \
%{mmcu=at43usb320:crt43320.o%s} \
@@ -814,22 +880,53 @@
@@ -848,12 +858,16 @@
%{mmcu=at76c711:crt76711.o%s} \
%{mmcu=atmega8|mmcu=avr4:crtm8.o%s} \
%{mmcu=atmega48:crtm48.o%s} \
+%{mmcu=atmega48p:crtm48p.o%s} \
%{mmcu=atmega88:crtm88.o%s} \
+%{mmcu=atmega88p:crtm88p.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=at90pwm1:crt90pwm1.o%s} \
%{mmcu=at90pwm2:crt90pwm2.o%s} \
+%{mmcu=at90pwm2b:crt90pwm2b.o%s} \
%{mmcu=at90pwm3:crt90pwm3.o%s} \
+%{mmcu=at90pwm3b:crt90pwm3b.o%s} \
%{mmcu=atmega16:crtm16.o%s} \
%{mmcu=atmega161|mmcu=avr5:crtm161.o%s} \
%{mmcu=atmega162:crtm162.o%s} \
%{mmcu=atmega163:crtm163.o%s} \
+%{mmcu=atmega164p:crtm164p.o%s} \
@@ -862,6 +876,7 @@
%{mmcu=atmega165:crtm165.o%s} \
+%{mmcu=atmega165p:crtm165p.o%s} \
%{mmcu=atmega165p:crtm165p.o%s} \
%{mmcu=atmega168:crtm168.o%s} \
+%{mmcu=atmega168p:crtm168p.o%s} \
%{mmcu=atmega169:crtm169.o%s} \
+%{mmcu=atmega169p:crtm169p.o%s} \
%{mmcu=atmega169p:crtm169p.o%s} \
%{mmcu=atmega32:crtm32.o%s} \
%{mmcu=atmega323:crtm323.o%s} \
+%{mmcu=atmega324p:crtm324p.o%s} \
%{mmcu=atmega325:crtm325.o%s} \
+%{mmcu=atmega325p:crtm325p.o%s} \
@@ -871,6 +886,7 @@
%{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} \
+%{mmcu=atmega640:crtm640.o%s} \
+%{mmcu=atmega644:crtm644.o%s} \
+%{mmcu=atmega644p:crtm644p.o%s} \
+%{mmcu=atmega645:crtm645.o%s} \
%{mmcu=atmega6450:crtm6450.o%s} \
+%{mmcu=atmega649:crtm649.o%s} \
+%{mmcu=atmega6490:crtm6490.o%s} \
%{mmcu=atmega128:crtm128.o%s} \
+%{mmcu=atmega1280:crtm1280.o%s} \
+%{mmcu=atmega1281:crtm1281.o%s} \
+%{mmcu=atmega8hva:crtm8hva.o%s} \
+%{mmcu=atmega16hva:crtm16hva.o%s} \
+%{mmcu=at90can32:crtcan32.o%s} \
+%{mmcu=at90can64:crtcan64.o%s} \
%{mmcu=atmega3250p:crtm3250p.o%s} \
+%{mmcu=atmega328p:crtm328p.o%s} \
%{mmcu=atmega329:crtm329.o%s} \
%{mmcu=atmega329p:crtm329p.o%s} \
%{mmcu=atmega3290:crtm3290.o%s} \
@@ -892,6 +908,8 @@
%{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} \
+%{mmcu=at90usb1287:crtusb1287.o%s} \
%{mmcu=at94k:crtat94k.o%s}"
#define EXTRA_SPECS {"crt_binutils", CRT_BINUTILS_SPECS},
+%{mmcu=at90pwm216:crt90pwm216.o%s} \
+%{mmcu=at90pwm316:crt90pwm316.o%s} \
%{mmcu=at90usb82:crtusb82.o%s} \
%{mmcu=at90usb162:crtusb162.o%s} \
%{mmcu=at90usb646:crtusb646.o%s} \

471
devel/avr-gcc/files/patch-zz-atmega256x
View file

@ -1,64 +1,76 @@
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;
Index: gcc/config/avr/avr.c
===================================================================
--- gcc/config/avr/avr.c (revision 124356)
+++ gcc/config/avr/avr.c (working copy)
@@ -129,22 +129,27 @@
/* Core have 'MOVW' and 'LPM Rx,Z' instructions. */
int avr_have_movw_lpmx_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;
+/* Core have 'EIJMP' and 'EICALL' instructions. */
+int avr_have_eijmp_eicall_p = 0;
+
struct base_arch_s {
int asm_only;
int enhanced;
int mega;
+ int three_byte_pc;
int have_movw_lpmx;
+ int have_eijmp_eicall;
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" }
- { 1, 0, 0, 0, NULL }, /* unknown device specified */
- { 1, 0, 0, 0, "__AVR_ARCH__=1" },
- { 0, 0, 0, 0, "__AVR_ARCH__=2" },
- { 0, 0, 0, 1, "__AVR_ARCH__=25"},
- { 0, 0, 1, 0, "__AVR_ARCH__=3" },
- { 0, 1, 0, 1, "__AVR_ARCH__=4" },
- { 0, 1, 1, 1, "__AVR_ARCH__=5" }
+ { 1, 0, 0, 0, 0, NULL }, /* unknown device specified */
+ { 1, 0, 0, 0, 0, "__AVR_ARCH__=1" },
+ { 0, 0, 0, 0, 0, "__AVR_ARCH__=2" },
+ { 0, 0, 0, 1, 0, "__AVR_ARCH__=25"},
+ { 0, 0, 1, 0, 0, "__AVR_ARCH__=3" },
+ { 0, 1, 0, 1, 0, "__AVR_ARCH__=4" },
+ { 0, 1, 1, 1, 0, "__AVR_ARCH__=5" },
+ { 0, 1, 1, 1, 1, "__AVR_ARCH__=6" }
};
/* These names are used as the index into the avr_arch_types[] table
@@ -158,7 +163,8 @@
ARCH_AVR25,
ARCH_AVR3,
ARCH_AVR4,
- ARCH_AVR5
+ ARCH_AVR5,
+ ARCH_AVR6
};
struct mcu_type_s {
@@ -237,6 +243,10 @@
{ "at90usb1286", 5, "__AVR_AT90USB1286__" },
{ "at90usb1287", 5, "__AVR_AT90USB1287__" },
{ "at94k", 5, "__AVR_AT94K__" },
@@ -269,6 +275,10 @@
{ "at90usb1286", ARCH_AVR5, "__AVR_AT90USB1286__" },
{ "at90usb1287", ARCH_AVR5, "__AVR_AT90USB1287__" },
{ "at94k", ARCH_AVR5, "__AVR_AT94K__" },
+ /* 3-Byte PC */
+ { "avr6", 6, NULL },
+ { "atmega2560", 6, "__AVR_ATmega2560__" },
+ { "atmega2561", 6, "__AVR_ATmega2561__" },
+ { "avr6", ARCH_AVR6, NULL },
+ { "atmega2560", ARCH_AVR6, "__AVR_ATmega2560__" },
+ { "atmega2561", ARCH_AVR6, "__AVR_ATmega2561__" },
/* Assembler only. */
{ "avr1", 1, NULL },
{ "at90s1200", 1, "__AVR_AT90S1200__" },
@@ -319,6 +329,11 @@
{ "avr1", ARCH_AVR1, NULL },
{ "at90s1200", ARCH_AVR1, "__AVR_AT90S1200__" },
@@ -351,6 +361,7 @@
avr_enhanced_p = base->enhanced;
avr_mega_p = base->mega;
avr_have_movw_lpmx_p = base->have_movw_lpmx;
+ avr_have_eijmp_eicall_p = base->have_eijmp_eicall;
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 @@
@@ -480,9 +491,10 @@
else
{
int offset = frame_pointer_needed ? 2 : 0;
+ int avr_pc_size = avr_have_eijmp_eicall_p ? 3 : 2;
offset += avr_regs_to_save (NULL);
- return get_frame_size () + 2 + 1 + offset;
@ -66,90 +78,7 @@ diff -ur gcc/config/avr/avr.c gcc-4.1.1-new-devices-m256/gcc/config/avr/avr.c
}
}
@@ -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,hi8(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 @@
@@ -1103,7 +1115,7 @@
&& ((GET_CODE (addr) == SYMBOL_REF && SYMBOL_REF_FUNCTION_P (addr))
|| GET_CODE (addr) == LABEL_REF))
{
@ -158,7 +87,19 @@ diff -ur gcc/config/avr/avr.c gcc-4.1.1-new-devices-m256/gcc/config/avr/avr.c
output_addr_const (file,addr);
fprintf (file ,")");
}
@@ -4518,7 +4504,7 @@
@@ -1128,6 +1140,11 @@
if (!AVR_MEGA)
fputc ('r', file);
}
+ else if (code == '!')
+ {
+ if (AVR_HAVE_EIJMP_EICALL)
+ fputc ('e', file);
+ }
else if (REG_P (x))
{
if (x == zero_reg_rtx)
@@ -4524,7 +4541,7 @@
&& ((GET_CODE (x) == SYMBOL_REF && SYMBOL_REF_FUNCTION_P (x))
|| GET_CODE (x) == LABEL_REF))
{
@ -167,70 +108,65 @@ diff -ur gcc/config/avr/avr.c gcc-4.1.1-new-devices-m256/gcc/config/avr/avr.c
output_addr_const (asm_out_file, x);
fputs (")\n", asm_out_file);
return true;
@@ -5880,7 +5866,7 @@
@@ -5898,7 +5915,7 @@
{
progmem_section ();
switch_to_section (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); \
--- gcc/config/avr/avr.h.orig Sun Oct 28 00:13:49 2007
+++ gcc/config/avr/avr.h Sun Oct 28 00:15:29 2007
@@ -36,6 +36,12 @@
builtin_define ("__AVR_HAVE_LPMX__"); \
if (avr_asm_only_p) \
builtin_define ("__AVR_ASM_ONLY__"); \
+ if (avr_pc_size == 2) \
+ if (!avr_have_eijmp_eicall_p) \
+ builtin_define ("__AVR_2_BYTE_PC__"); \
+ if (avr_pc_size == 3) \
+ if (avr_have_eijmp_eicall_p) \
+ builtin_define ("__AVR_3_BYTE_PC__"); \
+ if (avr_have_eijmp_eicall_p) \
+ builtin_define ("__AVR_HAVE_EIJMP_EICALL__"); \
if (avr_enhanced_p) \
builtin_define ("__AVR_ENHANCED__"); \
if (avr_mega_p) \
@@ -47,10 +51,14 @@
extern int avr_mega_p;
if (avr_enhanced_p) \
@@ -53,6 +59,8 @@
extern int avr_enhanced_p;
extern int avr_asm_only_p;
+extern int avr_pc_size;
extern int avr_have_movw_lpmx_p;
+extern int avr_have_eijmp_eicall_p;
+
#ifndef IN_LIBGCC2
extern GTY(()) section *progmem_section;
#endif
@@ -60,6 +68,7 @@
#define AVR_MEGA (avr_mega_p && !TARGET_SHORT_CALLS)
#define AVR_ENHANCED (avr_enhanced_p)
#define AVR_HAVE_MOVW (avr_have_movw_lpmx_p)
+#define AVR_HAVE_EIJMP_EICALL (avr_have_eijmp_eicall_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 @@
@@ -633,7 +642,7 @@
#define CPP_SPEC "%{posix:-D_POSIX_SOURCE}"
#define PRINT_OPERAND(STREAM, X, CODE) print_operand (STREAM, X, CODE)
-#define CC1_SPEC "%{profile:-p}"
+#define CC1_SPEC "%{profile:-p} -fno-delete-null-pointer-checks"
-#define PRINT_OPERAND_PUNCT_VALID_P(CODE) ((CODE) == '~')
+#define PRINT_OPERAND_PUNCT_VALID_P(CODE) ((CODE) == '~' || (CODE) == '!')
#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 PRINT_OPERAND_ADDRESS(STREAM, X) print_operand_address(STREAM, X)
#define ASM_SPEC "%{mmcu=*:-mmcu=%*}"
@@ -793,6 +802,7 @@
mmcu=at90can*|\
@@ -779,6 +788,7 @@
mmcu=at90pwm316|\
mmcu=at90usb*|\
mmcu=at94k:-m avr5}\
+%{mmcu=atmega256*:-m avr6}\
%{mmcu=atmega324*|\
mmcu=atmega325|\
mmcu=atmega3250|\
@@ -818,7 +828,8 @@
mmcu=atmega325*|\
mmcu=atmega328p|\
@@ -804,7 +814,8 @@
mmcu=at90usb*: -Tdata 0x800100}\
%{mmcu=atmega640|\
mmcu=atmega1280|\
@ -240,137 +176,87 @@ diff -ur gcc/config/avr/avr.h gcc-4.1.1-new-devices-m256/gcc/config/avr/avr.h
#define LIB_SPEC \
"%{!mmcu=at90s1*:%{!mmcu=attiny11:%{!mmcu=attiny12:%{!mmcu=attiny15:%{!mmcu=attiny28: -lc }}}}}"
@@ -904,6 +915,8 @@
@@ -903,6 +914,8 @@
%{mmcu=atmega128:crtm128.o%s} \
%{mmcu=atmega1280:crtm1280.o%s} \
%{mmcu=atmega1281:crtm1281.o%s} \
%{mmcu=atmega8hva:crtm8hva.o%s} \
%{mmcu=atmega16hva:crtm16hva.o%s} \
+%{mmcu=atmega2560:crtm2560.o%s} \
+%{mmcu=atmega2561:crtm2561.o%s} \
%{mmcu=atmega8hva:crtm8hva.o%s} \
%{mmcu=atmega16hva:crtm16hva.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 @@
Index: gcc/config/avr/avr.md
===================================================================
--- gcc/config/avr/avr.md (revision 124356)
+++ gcc/config/avr/avr.md (working copy)
@@ -33,6 +33,7 @@
;; p POST_INC or PRE_DEC address as a pointer (X, Y, Z)
;; r POST_INC or PRE_DEC address as a register (r26, r28, r30)
;; ~ Output 'r' if not AVR_MEGA.
+;; ! Output 'e' if AVR_HAVE_EIJMP_EICALL.
;; UNSPEC usage:
;; 0 Length of a string, see "strlenhi".
@@ -2100,22 +2101,22 @@
"(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\";
+ }
+ return \"%!icall\";
else if (which_alternative==1)
{
if (AVR_ENHANCED)
- return (AS2 (movw, r30, %0) CR_TAB
if (AVR_HAVE_MOVW)
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\");
+ }
+ \"%!icall\");
else
- return (AS2 (mov, r30, %A0) CR_TAB
- AS2 (mov, r31, %B0) CR_TAB
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\");
+ }
+ \"%!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
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\");
+ \"%!icall\");
}"
[(set_attr "cc" "clobber,clobber,clobber,clobber")
(set_attr_alternative "length"
@@ -2124,22 +2149,46 @@
@@ -2137,22 +2138,22 @@
"(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\";
+ }
+ return \"%!icall\";
else if (which_alternative==1)
{
if (AVR_ENHANCED)
- return (AS2 (movw, r30, %1) CR_TAB
if (AVR_HAVE_MOVW)
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\");
+ }
+ \"%!icall\");
else
- return (AS2 (mov, r30, %A1) CR_TAB
- AS2 (mov, r31, %B1) CR_TAB
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\");
+ }
+ \"%!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
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\");
+ \"%!icall\");
}"
[(set_attr "cc" "clobber,clobber,clobber,clobber")
(set_attr_alternative "length"
@@ -2169,13 +2218,20 @@
@@ -2182,13 +2183,20 @@
; indirect jump
(define_insn "indirect_jump"
[(set (pc) (match_operand:HI 0 "register_operand" "!z,*r"))]
- ""
+ "AVR_2_BYTE_PC"
+ "!AVR_HAVE_EIJMP_EICALL"
"@
ijmp
push %A0\;push %B0\;ret"
@ -379,7 +265,7 @@ diff -ur gcc/config/avr/avr.md gcc-4.1.1-new-devices-m256/gcc/config/avr/avr.md
+(define_insn "*indirect_jump_avr6"
+ [(set (pc) (match_operand:HI 0 "register_operand" "z"))]
+ "AVR_3_BYTE_PC"
+ "AVR_HAVE_EIJMP_EICALL"
+ "eijmp"
+ [(set_attr "length" "1")
+ (set_attr "cc" "none")])
@ -387,60 +273,42 @@ diff -ur gcc/config/avr/avr.md gcc-4.1.1-new-devices-m256/gcc/config/avr/avr.md
;; 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))
@@ -2197,7 +2205,7 @@
UNSPEC_INDEX_JMP))
(use (label_ref (match_operand 1 "" "")))
(clobber (match_dup 0))]
- "!AVR_MEGA"
+ "(!AVR_MEGA) && (AVR_2_BYTE_PC)"
+ "(!AVR_MEGA) && (!AVR_HAVE_EIJMP_EICALL)"
"@
ijmp
push %A0\;push %B0\;ret"
@@ -2200,11 +2256,26 @@
[(set_attr "length" "2")
@@ -2226,7 +2234,7 @@
lpm __tmp_reg__,Z+
lpm r31,Z
mov r30,__tmp_reg__
- ijmp"
+ %!ijmp"
[(set_attr "length" "6")
(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))
@@ -2235,7 +2243,7 @@
UNSPEC_INDEX_JMP))
(use (label_ref (match_operand 1 "" "")))
(clobber (match_dup 0))]
- "AVR_MEGA"
+ "AVR_MEGA && AVR_2_BYTE_PC"
+ "AVR_MEGA && !AVR_HAVE_EIJMP_EICALL"
"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
Index: gcc/config/avr/libgcc.S
===================================================================
--- gcc/config/avr/libgcc.S (revision 124356)
+++ gcc/config/avr/libgcc.S (working copy)
@@ -593,7 +593,12 @@
out __SP_H__,r29
out __SREG__,__tmp_reg__
out __SP_L__,r28
+#if defined (__AVR_3_BYTE_PC__)
+#if defined (__AVR_HAVE_EIJMP_EICALL__)
+ eijmp
+#else
ijmp
@ -454,7 +322,7 @@ diff -ur gcc/config/avr/libgcc.S gcc-4.1.1-new-devices-m256/gcc/config/avr/libgc
lpm r31, Z
mov r30, __tmp_reg__
+
+#if defined (__AVR_3_BYTE_PC__)
+#if defined (__AVR_HAVE_EIJMP_EICALL__)
+ eijmp
+#else
ijmp
@ -466,27 +334,28 @@ diff -ur gcc/config/avr/libgcc.S gcc-4.1.1-new-devices-m256/gcc/config/avr/libgc
push r0
lpm
push r0
+#if defined (__AVR_3_BYTE_PC__)
+#if defined (__AVR_HAVE_EIJMP_EICALL__)
+ 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
Index: gcc/config/avr/t-avr
===================================================================
--- gcc/config/avr/t-avr (revision 124356)
+++ gcc/config/avr/t-avr (working copy)
@@ -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
-MULTILIB_OPTIONS = mmcu=avr2/mmcu=avr25/mmcu=avr3/mmcu=avr4/mmcu=avr5
-MULTILIB_DIRNAMES = avr2 avr25 avr3 avr4 avr5
+MULTILIB_OPTIONS = mmcu=avr2/mmcu=avr25/mmcu=avr3/mmcu=avr4/mmcu=avr5/mmcu=avr6
+MULTILIB_DIRNAMES = avr2 avr25 avr3 avr4 avr5 avr6
# The many avr2 matches are not listed here - this is the default.
MULTILIB_MATCHES = \
@@ -90,7 +90,9 @@
@@ -111,7 +111,9 @@
mmcu?avr5=mmcu?at90usb647 \
mmcu?avr5=mmcu?at90usb1286 \
mmcu?avr5=mmcu?at90usb1287 \

17
devel/avr-gcc/pkg-descr
View file

@ -5,20 +5,15 @@ 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:
ATtiny24/ATtiny44/ATtiny84
ATtiny25/ATtiny45/ATtiny85 ATtiny261/ATtiny461/ATtiny861
ATmega164P/ATmega324P/ATmega644/ATmega644P
ATmega165P/ATmega169P/ATmega325P/ATmega3250P
ATmega329/ATmega3290/ATmega649/ATmega6490, including their "P" variants
ATmega406
ATmega640/ATmega1280/ATmega1281
AT90PWM1/PWM2/AT90PWM3 AT90CAN32/64 ATmega8HVA/ATmega16HVA
AT90USB82/162/646/647/1286/1287
ATmega2560/ATmega2561 (beta test)
ATtiny43U
ATtiny48
AT90PWM2B/PWM3B
AT90PWM216/PWM316
ATmega48P/88P/168P/328P
ATmega2560/ATmega2561
WWW: http://gcc.gnu.org/
WWW: http://www.nongnu.org/avr-libc/

111
devel/avr-gcc/pkg-plist
View file

@ -5,49 +5,53 @@ bin/avr-c++
bin/avr-cpp
bin/avr-g++
bin/avr-gcc
bin/avr-gcc-4.1.2
bin/avr-gcc-4.2.2
bin/avr-gccbug
lib/gcc/avr/4.1.2/avr3/libgcc.a
lib/gcc/avr/4.1.2/avr3/libgcov.a
lib/gcc/avr/4.1.2/avr4/libgcc.a
lib/gcc/avr/4.1.2/avr4/libgcov.a
lib/gcc/avr/4.1.2/avr5/libgcc.a
lib/gcc/avr/4.1.2/avr5/libgcov.a
lib/gcc/avr/4.1.2/avr6/libgcc.a
lib/gcc/avr/4.1.2/avr6/libgcov.a
lib/gcc/avr/4.1.2/include/README
lib/gcc/avr/4.1.2/include/fixed
lib/gcc/avr/4.1.2/include/float.h
lib/gcc/avr/4.1.2/include/iso646.h
lib/gcc/avr/4.1.2/include/limits.h
lib/gcc/avr/4.1.2/include/stdarg.h
lib/gcc/avr/4.1.2/include/stdbool.h
lib/gcc/avr/4.1.2/include/stddef.h
lib/gcc/avr/4.1.2/include/syslimits.h
lib/gcc/avr/4.1.2/include/unwind.h
lib/gcc/avr/4.1.2/include/varargs.h
lib/gcc/avr/4.1.2/install-tools/gsyslimits.h
lib/gcc/avr/4.1.2/install-tools/include/README
lib/gcc/avr/4.1.2/install-tools/include/float.h
lib/gcc/avr/4.1.2/install-tools/include/iso646.h
lib/gcc/avr/4.1.2/install-tools/include/limits.h
lib/gcc/avr/4.1.2/install-tools/include/stdarg.h
lib/gcc/avr/4.1.2/install-tools/include/stdbool.h
lib/gcc/avr/4.1.2/install-tools/include/stddef.h
lib/gcc/avr/4.1.2/install-tools/include/unwind.h
lib/gcc/avr/4.1.2/install-tools/include/varargs.h
lib/gcc/avr/4.1.2/install-tools/macro_list
lib/gcc/avr/4.1.2/install-tools/mkheaders.conf
lib/gcc/avr/4.1.2/libgcc.a
lib/gcc/avr/4.1.2/libgcov.a
libexec/gcc/avr/4.1.2/cc1
libexec/gcc/avr/4.1.2/cc1plus
libexec/gcc/avr/4.1.2/collect2
libexec/gcc/avr/4.1.2/install-tools/fix-header
libexec/gcc/avr/4.1.2/install-tools/fixinc.sh
libexec/gcc/avr/4.1.2/install-tools/fixincl
libexec/gcc/avr/4.1.2/install-tools/fixproto
libexec/gcc/avr/4.1.2/install-tools/mkheaders
lib/gcc/avr/4.2.2/avr25/libgcc.a
lib/gcc/avr/4.2.2/avr25/libgcov.a
lib/gcc/avr/4.2.2/avr3/libgcc.a
lib/gcc/avr/4.2.2/avr3/libgcov.a
lib/gcc/avr/4.2.2/avr4/libgcc.a
lib/gcc/avr/4.2.2/avr4/libgcov.a
lib/gcc/avr/4.2.2/avr5/libgcc.a
lib/gcc/avr/4.2.2/avr5/libgcov.a
lib/gcc/avr/4.2.2/avr6/libgcc.a
lib/gcc/avr/4.2.2/avr6/libgcov.a
lib/gcc/avr/4.2.2/include/README
lib/gcc/avr/4.2.2/include/decfloat.h
lib/gcc/avr/4.2.2/include/fixed
lib/gcc/avr/4.2.2/include/float.h
lib/gcc/avr/4.2.2/include/iso646.h
lib/gcc/avr/4.2.2/include/limits.h
lib/gcc/avr/4.2.2/include/stdarg.h
lib/gcc/avr/4.2.2/include/stdbool.h
lib/gcc/avr/4.2.2/include/stddef.h
lib/gcc/avr/4.2.2/include/syslimits.h
lib/gcc/avr/4.2.2/include/unwind.h
lib/gcc/avr/4.2.2/include/varargs.h
lib/gcc/avr/4.2.2/install-tools/gsyslimits.h
lib/gcc/avr/4.2.2/install-tools/include/README
lib/gcc/avr/4.2.2/install-tools/include/decfloat.h
lib/gcc/avr/4.2.2/install-tools/include/float.h
lib/gcc/avr/4.2.2/install-tools/include/iso646.h
lib/gcc/avr/4.2.2/install-tools/include/limits.h
lib/gcc/avr/4.2.2/install-tools/include/stdarg.h
lib/gcc/avr/4.2.2/install-tools/include/stdbool.h
lib/gcc/avr/4.2.2/install-tools/include/stddef.h
lib/gcc/avr/4.2.2/install-tools/include/unwind.h
lib/gcc/avr/4.2.2/install-tools/include/varargs.h
lib/gcc/avr/4.2.2/install-tools/macro_list
lib/gcc/avr/4.2.2/install-tools/mkheaders.conf
lib/gcc/avr/4.2.2/libgcc.a
lib/gcc/avr/4.2.2/libgcov.a
libexec/gcc/avr/4.2.2/cc1
libexec/gcc/avr/4.2.2/cc1plus
libexec/gcc/avr/4.2.2/collect2
libexec/gcc/avr/4.2.2/install-tools/fix-header
libexec/gcc/avr/4.2.2/install-tools/fixinc.sh
libexec/gcc/avr/4.2.2/install-tools/fixincl
libexec/gcc/avr/4.2.2/install-tools/fixproto
libexec/gcc/avr/4.2.2/install-tools/mkheaders
share/locale/be/LC_MESSAGES/cpplib.mo
share/locale/be/LC_MESSAGES/gcc.mo
share/locale/ca/LC_MESSAGES/cpplib.mo
@ -69,10 +73,12 @@ share/locale/nl/LC_MESSAGES/gcc.mo
share/locale/ru/LC_MESSAGES/gcc.mo
share/locale/rw/LC_MESSAGES/cpplib.mo
share/locale/rw/LC_MESSAGES/gcc.mo
share/locale/sr/LC_MESSAGES/gcc.mo
share/locale/sv/LC_MESSAGES/cpplib.mo
share/locale/sv/LC_MESSAGES/gcc.mo
share/locale/tr/LC_MESSAGES/cpplib.mo
share/locale/tr/LC_MESSAGES/gcc.mo
share/locale/uk/LC_MESSAGES/cpplib.mo
share/locale/vi/LC_MESSAGES/cpplib.mo
share/locale/zh_CN/LC_MESSAGES/cpplib.mo
share/locale/zh_CN/LC_MESSAGES/gcc.mo
@ -80,17 +86,18 @@ share/locale/zh_TW/LC_MESSAGES/cpplib.mo
share/locale/zh_TW/LC_MESSAGES/gcc.mo
@dirrmtry share/locale/rw/LC_MESSAGES
@dirrmtry share/locale/rw
@dirrm lib/gcc/avr/4.1.2/avr3
@dirrm lib/gcc/avr/4.1.2/avr4
@dirrm lib/gcc/avr/4.1.2/avr5
@dirrm lib/gcc/avr/4.1.2/avr6
@dirrm lib/gcc/avr/4.1.2/include
@dirrm lib/gcc/avr/4.1.2/install-tools/include
@dirrm lib/gcc/avr/4.1.2/install-tools
@dirrm lib/gcc/avr/4.1.2
@dirrm lib/gcc/avr/4.2.2/avr25
@dirrm lib/gcc/avr/4.2.2/avr3
@dirrm lib/gcc/avr/4.2.2/avr4
@dirrm lib/gcc/avr/4.2.2/avr5
@dirrm lib/gcc/avr/4.2.2/avr6
@dirrm lib/gcc/avr/4.2.2/include
@dirrm lib/gcc/avr/4.2.2/install-tools/include
@dirrm lib/gcc/avr/4.2.2/install-tools
@dirrm lib/gcc/avr/4.2.2
@dirrm lib/gcc/avr
@dirrm lib/gcc
@dirrm libexec/gcc/avr/4.1.2/install-tools
@dirrm libexec/gcc/avr/4.1.2
@dirrm libexec/gcc/avr/4.2.2/install-tools
@dirrm libexec/gcc/avr/4.2.2
@dirrm libexec/gcc/avr
@dirrm libexec/gcc