Attachment 145163 Details for Bug 192278 – patch to devel/avr-gcc

[patch] patch to devel/avr-gcc

patch.diffs (text/plain), 3.63 KB, created by Craig Leres on 2014-07-30 18:42:47 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Craig Leres

Created: 2014-07-30 18:42:47 UTC

Size: 3.63 KB

patch

obsolete

>Index: Makefile
>===================================================================
>--- Makefile	(revision 363458)
>+++ Makefile	(working copy)
>@@ -3,7 +3,7 @@
> 
> PORTNAME=	gcc
> PORTVERSION=	4.5.1
>-PORTREVISION=	2
>+PORTREVISION=	3
> CATEGORIES=	devel
> MASTER_SITES=	${MASTER_SITE_GCC}
> MASTER_SITES+=	http://people.freebsd.org/~joerg/:local
>@@ -18,8 +18,6 @@
> 
> COMMENT=	FSF GCC 4.x for Atmel AVR 8-bit RISC cross-development
> 
>-BROKEN=		Fails to build with avr-binutils 2.24
>-
> BUILD_DEPENDS=	avr-as:${PORTSDIR}/devel/avr-binutils \
> 		avr-ld:${PORTSDIR}/devel/avr-binutils
> LIB_DEPENDS=	libmpfr.so:${PORTSDIR}/math/mpfr \
>Index: files/patch-403-gcc-4.5.1-atmega48pa
>===================================================================
>--- files/patch-403-gcc-4.5.1-atmega48pa	(revision 363458)
>+++ files/patch-403-gcc-4.5.1-atmega48pa	(working copy)
>@@ -9,9 +9,19 @@
>    { "atmega48p",            ARCH_AVR4, "__AVR_ATmega48P__",         0, 0x0100, "m48p" },
>    { "atmega88",             ARCH_AVR4, "__AVR_ATmega88__",          0, 0x0100, "m88" },
>    { "atmega88a",            ARCH_AVR4, "__AVR_ATmega88A__",         0, 0x0100, "m88a" },
>-diff -Naurp gcc/config/avr/t-avr gcc/config/avr/t-avr
>---- gcc/config/avr/t-avr	2011-06-20 12:23:54.000000000 +0530
>-+++ gcc/config/avr/t-avr	2011-06-20 12:11:26.000000000 +0530
>+--- gcc/config/avr/t-avr	2014-07-30 11:18:18.000000000 -0700
>++++ gcc/config/avr/t-avr	2014-07-30 11:28:54.000000000 -0700
>+@@ -107,8 +107,8 @@ fp-bit.c: $(srcdir)/config/fp-bit.c $(sr
>+ 
>+ FPBIT = fp-bit.c
>+ 
>+-MULTILIB_OPTIONS = mmcu=avr2/mmcu=avr25/mmcu=avr3/mmcu=avr31/mmcu=avr35/mmcu=avr4/mmcu=avr5/mmcu=avr51/mmcu=avr6/mmcu=avrxmega2/mmcu=avrxmega4/mmcu=avrxmega5/mmcu=avrxmega6/mmcu=avrxmega7/mmcu=avrtiny10
>+-MULTILIB_DIRNAMES = avr2 avr25 avr3 avr31 avr35 avr4 avr5 avr51 avr6 avrxmega2 avrxmega4 avrxmega5 avrxmega6 avrxmega7 avrtiny10
>++MULTILIB_OPTIONS = mmcu=avr2/mmcu=avr25/mmcu=avr3/mmcu=avr31/mmcu=avr35/mmcu=avr4/mmcu=avr5/mmcu=avr51/mmcu=avr6/mmcu=avrxmega2/mmcu=avrxmega4/mmcu=avrxmega5/mmcu=avrxmega6/mmcu=avrxmega7
>++MULTILIB_DIRNAMES = avr2 avr25 avr3 avr31 avr35 avr4 avr5 avr51 avr6 avrxmega2 avrxmega4 avrxmega5 avrxmega6 avrxmega7
>+ 
>+ # The many avr2 matches are not listed here - this is the default.
>+ MULTILIB_MATCHES = \
> @@ -155,6 +155,7 @@ MULTILIB_MATCHES = \
>  	mmcu?avr35=mmcu?attiny1634 \
>  	mmcu?avr4=mmcu?atmega48 \
>@@ -20,3 +30,18 @@
>  	mmcu?avr4=mmcu?atmega48p \
>  	mmcu?avr4=mmcu?atmega8 \
>  	mmcu?avr4=mmcu?atmega8515 \
>+@@ -284,13 +285,7 @@ MULTILIB_MATCHES = \
>+ 	mmcu?avrxmega6=mmcu?atxmega256a3bu \
>+ 	mmcu?avrxmega6=mmcu?atxmega256d3 \
>+ 	mmcu?avrxmega7=mmcu?atxmega128a1 \
>+-	mmcu?avrxmega7=mmcu?atxmega128a1u \
>+-	mmcu?avrtiny10=mmcu?attiny4 \
>+-	mmcu?avrtiny10=mmcu?attiny5 \
>+-	mmcu?avrtiny10=mmcu?attiny9 \
>+-	mmcu?avrtiny10=mmcu?attiny10 \
>+-	mmcu?avrtiny10=mmcu?attiny20 \
>+-	mmcu?avrtiny10=mmcu?attiny40 
>++	mmcu?avrxmega7=mmcu?atxmega128a1u
>+ 
>+ MULTILIB_EXCEPTIONS =
>+ 
>Index: pkg-plist
>===================================================================
>--- pkg-plist	(revision 363458)
>+++ pkg-plist	(working copy)
>@@ -33,8 +33,6 @@
> lib/gcc/avr/4.5.1/avrxmega6/libgcov.a
> lib/gcc/avr/4.5.1/avrxmega7/libgcc.a
> lib/gcc/avr/4.5.1/avrxmega7/libgcov.a
>-lib/gcc/avr/4.5.1/avrtiny10/libgcc.a
>-lib/gcc/avr/4.5.1/avrtiny10/libgcov.a
> lib/gcc/avr/4.5.1/include-fixed/README
> lib/gcc/avr/4.5.1/include-fixed/limits.h
> lib/gcc/avr/4.5.1/include-fixed/syslimits.h
>@@ -231,7 +229,6 @@
> @dirrm lib/gcc/avr/4.5.1/avrxmega5
> @dirrm lib/gcc/avr/4.5.1/avrxmega6
> @dirrm lib/gcc/avr/4.5.1/avrxmega7
>-@dirrm lib/gcc/avr/4.5.1/avrtiny10
> @dirrm lib/gcc/avr/4.5.1/include
> @dirrm lib/gcc/avr/4.5.1/include-fixed
> @dirrm lib/gcc/avr/4.5.1/install-tools/include

Actions: View | Diff

Attachments on bug 192278: 145163