diff options
author | joerg <joerg@FreeBSD.org> | 2006-09-29 05:44:52 +0800 |
---|---|---|
committer | joerg <joerg@FreeBSD.org> | 2006-09-29 05:44:52 +0800 |
commit | 65cc353d9a661b14f24773bde0180002bf041db2 (patch) | |
tree | 32a8876934c1eef5c68a1ccd7676a2976bbc8fd2 | |
parent | 5fecfb43b2089d52fe499bb6add2d5a769c2e891 (diff) | |
download | freebsd-ports-gnome-65cc353d9a661b14f24773bde0180002bf041db2.tar.gz freebsd-ports-gnome-65cc353d9a661b14f24773bde0180002bf041db2.tar.zst freebsd-ports-gnome-65cc353d9a661b14f24773bde0180002bf041db2.zip |
Fix the COMMENT to tell this is GCC 4.x rather than 3.x. Pointed out
by Simon Barner.
Revert the default debugging format to stabs but offer DWARF-2 as an
option (rather than being the default). AVR-GDB currently understands
stabs much better than DWARF-2.
Fix a bug in patch-zz-atmega256x that caused -fcall-prologues to
generate faulty code. This affected libgcc.a as it uses this option.
This bug has been originally found and fixed by Wang Guohui but I
missed his fix when adding the patch here.
-rw-r--r-- | devel/avr-gcc-devel/Makefile | 5 | ||||
-rw-r--r-- | devel/avr-gcc-devel/files/patch-dwarf | 3 | ||||
-rw-r--r-- | devel/avr-gcc-devel/files/patch-zz-atmega256x | 2 |
3 files changed, 6 insertions, 4 deletions
diff --git a/devel/avr-gcc-devel/Makefile b/devel/avr-gcc-devel/Makefile index a9f158aba3d6..94ccaefa6a34 100644 --- a/devel/avr-gcc-devel/Makefile +++ b/devel/avr-gcc-devel/Makefile @@ -7,6 +7,7 @@ PORTNAME= gcc PORTVERSION= 4.1.1 +PORTREVISION= 1 CATEGORIES= devel MASTER_SITES= ${MASTER_SITE_GCC} MASTER_SITES+= http://people.freebsd.org/~joerg/:local @@ -18,7 +19,7 @@ EXTRACT_ONLY= gcc-core-${PORTVERSION}${EXTRACT_SUFX} \ gcc-g++-${PORTVERSION}${EXTRACT_SUFX} MAINTAINER= joerg@freebsd.org -COMMENT= FSF GCC 3.x for Atmel AVR 8-bit RISC cross-development +COMMENT= FSF GCC 4.x for Atmel AVR 8-bit RISC cross-development BUILD_DEPENDS= avr-as:${PORTSDIR}/devel/avr-binutils \ avr-ld:${PORTSDIR}/devel/avr-binutils @@ -47,7 +48,7 @@ ARCH= x86_64 CONFLICTS= avr-gcc-3* -CONFIGURE_ARGS= --target=avr --disable-libssp --with-dwarf2 +CONFIGURE_ARGS= --target=avr --disable-libssp MAKE_FLAGS= LANGUAGES="c c++" # get rid of that silly -mcpu=pentiumpro FreeBSD 5+ is so fond of. :-( diff --git a/devel/avr-gcc-devel/files/patch-dwarf b/devel/avr-gcc-devel/files/patch-dwarf index aa91a6e28879..316080d37166 100644 --- a/devel/avr-gcc-devel/files/patch-dwarf +++ b/devel/avr-gcc-devel/files/patch-dwarf @@ -1,8 +1,9 @@ --- gcc/config/avr/avr.h.orig 2006-04-13 15:31:19.000000000 +0200 +++ gcc/config/avr/avr.h 2006-04-13 16:23:16.000000000 +0200 -@@ -892,3 +892,6 @@ +@@ -892,3 +892,7 @@ #define ZERO_REGNO 1 ++#define DWARF2_DEBUGGING_INFO 1 #define PREFERRED_DEBUGGING_TYPE DBX_DEBUG + +/* Offset from the frame pointer register value to the top of the stack. */ diff --git a/devel/avr-gcc-devel/files/patch-zz-atmega256x b/devel/avr-gcc-devel/files/patch-zz-atmega256x index fd1e9085232d..b096badd2a5f 100644 --- a/devel/avr-gcc-devel/files/patch-zz-atmega256x +++ b/devel/avr-gcc-devel/files/patch-zz-atmega256x @@ -107,7 +107,7 @@ diff -ur gcc/config/avr/avr.c gcc-4.1.1-new-devices-m256/gcc/config/avr/avr.c - 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); ++ AS2 (ldi,r31,hi8(gs(1f))) CR_TAB), file); prologue_size += 4; |