Attachment #185873 for bug #221905

Lines 30-36 Link Here

(-)lang/gcc48/Makefile (-2 / +2 lines)
30	# once installed.	30	# once installed.
31	GCC_VERSION= ${PORTVERSION}	31	GCC_VERSION= ${PORTVERSION}
32	SUFFIX= ${PORTVERSION:C/([0-9]+).([0-9]+).*/\1\2/}	32	SUFFIX= ${PORTVERSION:C/([0-9]+).([0-9]+).*/\1\2/}
33	ONLY_FOR_ARCHS= amd64 armv6 i386 powerpc powerpc64 sparc64	33	ONLY_FOR_ARCHS= amd64 armv6 armv7 i386 powerpc powerpc64 sparc64
34	USES= compiler cpe gmake iconv libtool makeinfo perl5 tar:bzip2	34	USES= compiler cpe gmake iconv libtool makeinfo perl5 tar:bzip2
35	USE_BINUTILS= yes	35	USE_BINUTILS= yes
36	USE_PERL5= build	36	USE_PERL5= build
Lines 59-65 Link Here
59	CONFIGURE_ENV+= UNAME_m="powerpc64"	59	CONFIGURE_ENV+= UNAME_m="powerpc64"
60	.endif	60	.endif
61		61
62	.if ${ARCH} == "armv6"	62	.if ${ARCH} == armv6 \|\| ${ARCH} == armv7
63	# Override sys.mk including -O in CFLAGS which breaks libgomp building.	63	# Override sys.mk including -O in CFLAGS which breaks libgomp building.
64	CFLAGS:= ${CFLAGS:S/-O/-O2/g}	64	CFLAGS:= ${CFLAGS:S/-O/-O2/g}
65	. if ${COMPILER_TYPE} == clang	65	. if ${COMPILER_TYPE} == clang

Lines 230-237 Link Here

(-)lang/gcc48/files/patch-arm-support (-3 / +7 lines)
230	\ No newline at end of property	230	\ No newline at end of property
231	Index: gcc/config.gcc	231	Index: gcc/config.gcc
232	===================================================================	232	===================================================================
233	--- gcc/config.gcc (revision 218760)	233	--- gcc/config.gcc.orig 2015-05-21 20:57:29.000000000 +0000
234	+++ gcc/config.gcc (working copy)	234	+++ gcc/config.gcc 2017-08-28 15:07:25.941158130 +0000
235	@@ -267,7 +267,6 @@	235	@@ -267,7 +267,6 @@
236	arm-wince-pe \	236	arm-wince-pe \
237	\| arm--ecos-elf \	237	\| arm--ecos-elf \
Lines 240-246 Link Here
240	\| arm--linux* \	240	\| arm--linux* \
241	\| arm--uclinux* \	241	\| arm--uclinux* \
242	\| i[34567]86-go32-* \	242	\| i[34567]86-go32-* \
243	@@ -865,6 +864,28 @@	243	@@ -865,6 +864,32 @@
244	extra_options="${extra_options} arm/vxworks.opt"	244	extra_options="${extra_options} arm/vxworks.opt"
245	tmake_file="${tmake_file} arm/t-arm arm/t-vxworks"	245	tmake_file="${tmake_file} arm/t-arm arm/t-vxworks"
246	;;	246	;;
Lines 257-262 Link Here
257	+ armv6--freebsd*)	257	+ armv6--freebsd*)
258	+ tm_defines="${tm_defines} TARGET_FREEBSD_ARMv6=1"	258	+ tm_defines="${tm_defines} TARGET_FREEBSD_ARMv6=1"
259	+ ;;	259	+ ;;
		260	+ armv7--freebsd*)
		261	+ tm_defines="${tm_defines} TARGET_FREEBSD_ARMv7=1"
		262	+ tm_defines="${tm_defines} TARGET_FREEBSD_ARM_HARD_FLOAT=1"
		263	+ ;;
260	+ esac	264	+ esac
261	+ case $target in	265	+ case $target in
262	+ armhf--freebsd*)	266	+ armhf--freebsd*)

Lines 30-36 Link Here

(-)lang/gcc49/Makefile (-2 / +2 lines)
30	# once installed.	30	# once installed.
31	GCC_VERSION= ${PORTVERSION}	31	GCC_VERSION= ${PORTVERSION}
32	SUFFIX= ${PORTVERSION:C/([0-9]+).([0-9]+).*/\1\2/}	32	SUFFIX= ${PORTVERSION:C/([0-9]+).([0-9]+).*/\1\2/}
33	ONLY_FOR_ARCHS= amd64 armv6 i386 powerpc powerpc64 sparc64	33	ONLY_FOR_ARCHS= amd64 armv6 armv7 i386 powerpc powerpc64 sparc64
34	USES= compiler cpe gmake iconv libtool makeinfo perl5 tar:bzip2	34	USES= compiler cpe gmake iconv libtool makeinfo perl5 tar:bzip2
35	USE_BINUTILS= yes	35	USE_BINUTILS= yes
36	USE_PERL5= build	36	USE_PERL5= build
Lines 59-65 Link Here
59	CONFIGURE_ENV+= UNAME_m="powerpc64"	59	CONFIGURE_ENV+= UNAME_m="powerpc64"
60	.endif	60	.endif
61		61
62	.if ${ARCH} == "armv6"	62	.if ${ARCH} == armv6 \|\| ${ARCH} == armv7
63	# Override sys.mk including -O in CFLAGS which breaks libgomp building.	63	# Override sys.mk including -O in CFLAGS which breaks libgomp building.
64	CFLAGS:= ${CFLAGS:S/-O/-O2/g}	64	CFLAGS:= ${CFLAGS:S/-O/-O2/g}
65	. if ${COMPILER_TYPE} == clang	65	. if ${COMPILER_TYPE} == clang

Lines 258-266 Link Here

(-)lang/gcc49/files/patch-arm-support (-4 / +8 lines)
258	\ No newline at end of property	258	\ No newline at end of property
259	Index: gcc/config.gcc	259	Index: gcc/config.gcc
260	===================================================================	260	===================================================================
261	--- gcc/config.gcc (revision 218760)	261	--- gcc/config.gcc.orig 2016-03-14 10:03:12.000000000 +0000
262	+++ gcc/config.gcc (working copy)	262	+++ gcc/config.gcc 2017-08-28 14:49:38.426853558 +0000
263	@@ -267,7 +267,6 @@	263	@@ -268,7 +268,6 @@
264	arm-wince-pe \	264	arm-wince-pe \
265	\| arm--ecos-elf \	265	\| arm--ecos-elf \
266	\| arm--elf \	266	\| arm--elf \
Lines 268-274 Link Here
268	\| arm--linux* \	268	\| arm--linux* \
269	\| arm--uclinux* \	269	\| arm--uclinux* \
270	\| i[34567]86-go32-* \	270	\| i[34567]86-go32-* \
271	@@ -865,6 +864,28 @@	271	@@ -1013,6 +1012,32 @@
272	extra_options="${extra_options} arm/vxworks.opt"	272	extra_options="${extra_options} arm/vxworks.opt"
273	tmake_file="${tmake_file} arm/t-arm arm/t-vxworks"	273	tmake_file="${tmake_file} arm/t-arm arm/t-vxworks"
274	;;	274	;;
Lines 285-290 Link Here
285	+ armv6--freebsd*)	285	+ armv6--freebsd*)
286	+ tm_defines="${tm_defines} TARGET_FREEBSD_ARMv6=1"	286	+ tm_defines="${tm_defines} TARGET_FREEBSD_ARMv6=1"
287	+ ;;	287	+ ;;
		288	+ armv7--freebsd*)
		289	+ tm_defines="${tm_defines} TARGET_FREEBSD_ARMv7=1"
		290	+ tm_defines="${tm_defines} TARGET_FREEBSD_ARM_HARD_FLOAT=1"
		291	+ ;;
288	+ esac	292	+ esac
289	+ case $target in	293	+ case $target in
290	+ armhf--freebsd*)	294	+ armhf--freebsd*)





GCC_VERSION=	${PORTVERSION}
SUFFIX=		${PORTVERSION:C/([0-9]+).*/\1/}
ONLY_FOR_ARCHS=	aarch64 amd64 arm armv6 armv7 i386 powerpc powerpc64 sparc64
USES=		compiler cpe gmake iconv libtool makeinfo perl5 tar:bzip2
USE_BINUTILS=	yes
USE_PERL5=	build


.include <bsd.port.pre.mk>

.if ${ARCH} == amd64
CONFIGURE_TARGET=	x86_64-portbld-${OPSYS:tl}${OSREL}
.endif


CONFIGURE_ENV+=	UNAME_m="powerpc64"
.endif

.if ${ARCH} == aarch64 || ${ARCH} == armv6 || ${ARCH} == armv7
. if ${COMPILER_TYPE} == clang
.  if empty(PORT_OPTIONS:MBOOTSTRAP)
MAKE_ARGS+=CXXFLAGS=-fbracket-depth=512

		gcc${SUFFIX}/gfortran \
		gcc${SUFFIX}/libgomp
# Release tarballs (as opposed to snapshots) always carry this.
#.if ${ARCH} == amd64 || ${ARCH} == i386
INFO+=		gcc${SUFFIX}/libquadmath \
		gcc${SUFFIX}/libitm
#.endif




--- gcc/config.gcc.orig	2017-08-28 14:39:10.252636684 +0000
+++ gcc/config.gcc	2017-08-28 14:40:31.747542221 +0000
@@ -1031,11 +1031,14 @@
@@ -1026,11 +1026,9 @@
 	case $target in
 	armv6*-*-freebsd*)
 	    tm_defines="${tm_defines} TARGET_FREEBSD_ARMv6=1"

-	    tm_defines="${tm_defines} TARGET_FREEBSD_ARM_HARD_FLOAT=1"
+	    if test $fbsd_major -ge 11; then
+               tm_defines="${tm_defines} TARGET_FREEBSD_ARM_HARD_FLOAT=1"
+	    fi
+	    ;;
+	armv7*-*-freebsd*)
+	    tm_defines="${tm_defines} TARGET_FREEBSD_ARMv7=1"
+	    tm_defines="${tm_defines} TARGET_FREEBSD_ARM_HARD_FLOAT=1"
+	    fi
 	    ;;
 	esac
 	with_tls=${with_tls:-gnu}




DIST_VERSION=	${PORTVERSION:C/([0-9]+).*\.s([0-9]+)/\1-\2/}
GCC_VERSION=	${PORTVERSION:C/(.+)\.s[0-9]{8}/\1/}
SUFFIX=		${PORTVERSION:C/([0-9]+).*/\1/}
ONLY_FOR_ARCHS=	aarch64 amd64 arm armv6 armv7 i386 powerpc powerpc64 sparc64
USES=		compiler cpe gmake iconv libtool makeinfo perl5 tar:xz
USE_BINUTILS=	yes
USE_PERL5=	build


.include <bsd.port.pre.mk>

.if ${ARCH} == amd64
CONFIGURE_TARGET=	x86_64-portbld-${OPSYS:tl}${OSREL}
.endif


CONFIGURE_ENV+=	UNAME_m="powerpc64"
.endif

.if ${ARCH} == aarch64 || ${ARCH} == armv6 || ${ARCH} == armv7
. if ${COMPILER_TYPE} == clang
.  if empty(PORT_OPTIONS:MBOOTSTRAP)
MAKE_ARGS+=CXXFLAGS+=-fbracket-depth=512

		gcc${SUFFIX}/gccint \
		gcc${SUFFIX}/gfortran \
		gcc${SUFFIX}/libgomp
.if ${ARCH} == amd64 || ${ARCH} == i386
INFO+=		gcc${SUFFIX}/libquadmath \
		gcc${SUFFIX}/libitm
.endif





GCC_VERSION=	${PORTVERSION}
SUFFIX=		${PORTVERSION:C/([0-9]+).*/\1/}
ONLY_FOR_ARCHS=	aarch64 amd64 arm armv6 armv7 i386 powerpc powerpc64 sparc64
USES=		compiler cpe gmake iconv libtool makeinfo perl5 tar:xz
USE_BINUTILS=	yes
USE_PERL5=	build


.include <bsd.port.pre.mk>

.if ${ARCH} == amd64
CONFIGURE_TARGET=	x86_64-portbld-${OPSYS:tl}${OSREL}
.endif


USE_GCC=	5	# Cannot require ourselves, needs to be at least 4.9.
.endif

.if ${ARCH} == aarch64 || ${ARCH} == armv6 || ${ARCH} == armv7
. if ${COMPILER_TYPE} == clang
.  if empty(PORT_OPTIONS:MBOOTSTRAP)
MAKE_ARGS+=CXXFLAGS=-fbracket-depth=512

		gcc${SUFFIX}/gfortran \
		gcc${SUFFIX}/libgomp
# Release tarballs (as opposed to snapshots) always carry this.
#.if ${ARCH} == amd64 || ${ARCH} == i386
INFO+=		gcc${SUFFIX}/libquadmath \
		gcc${SUFFIX}/libitm
#.endif




DIST_VERSION=	${PORTVERSION:C/([0-9]+).*\.s([0-9]+)/\1-\2/}
GCC_VERSION=	${PORTVERSION:C/(.+)\.s[0-9]{8}/\1/}
SUFFIX=		${PORTVERSION:C/([0-9]+).*/\1/}
ONLY_FOR_ARCHS=	aarch64 amd64 arm armv6 armv7 i386 powerpc powerpc64 sparc64
USES=		compiler cpe gmake iconv libtool makeinfo perl5 tar:xz
USE_BINUTILS=	yes
USE_PERL5=	build


.include <bsd.port.pre.mk>

.if ${ARCH} == amd64
CONFIGURE_TARGET=	x86_64-portbld-${OPSYS:tl}${OSREL}
.endif


USE_GCC=	5	# Cannot require ourselves, needs to be at least 4.9.
.endif

.if ${ARCH} == aarch64 || ${ARCH} == armv6 || ${ARCH} == armv7
. if ${COMPILER_TYPE} == clang
.  if empty(PORT_OPTIONS:MBOOTSTRAP)
MAKE_ARGS+=CXXFLAGS=-fbracket-depth=512

		gcc${SUFFIX}/gccint \
		gcc${SUFFIX}/gfortran \
		gcc${SUFFIX}/libgomp
.if ${ARCH} == amd64 || ${ARCH} == i386
INFO+=		gcc${SUFFIX}/libquadmath \
		gcc${SUFFIX}/libitm
.endif





.include <bsd.port.pre.mk>

.if ${ARCH} == amd64
CONFIGURE_TARGET=	x86_64-portbld-${OPSYS:tl}${OSREL}
.endif


USE_GCC=	yes
.endif

.if ${ARCH} == armv6 || ${ARCH} == armv7
. if ${COMPILER_TYPE} == clang
.  if empty(PORT_OPTIONS:MBOOTSTRAP)
MAKE_ARGS+=CXXFLAGS+=-fbracket-depth=512

		gcc${SUFFIX}/gfortran \
		gcc${SUFFIX}/libgomp
# Release tarballs (as opposed to snapshots) always carry this.
#.if ${ARCH} == amd64 || ${ARCH} == i386
INFO+=		gcc${SUFFIX}/libquadmath \
		gcc${SUFFIX}/libitm
#.endif




LICENSE=	GPLv3 GPLv3RLE
LICENSE_COMB=	multi

ONLY_FOR_ARCHS=	aarch64 amd64 arm armv6 armv7 i386 powerpc powerpc64 sparc64
LIB_DEPENDS=	libgmp.so:math/gmp \
		libmpfr.so:math/mpfr \
		libmpc.so:math/mpc


.include <bsd.port.pre.mk>

.if ${ARCH} == amd64
CONFIGURE_TARGET=	x86_64-portbld-${OPSYS:tl}${OSREL}
.endif


USE_GCC=	yes
.endif

.if ${ARCH} == armv6 || ${ARCH} == armv7
. if ${COMPILER_TYPE} == clang
.  if empty(PORT_OPTIONS:MBOOTSTRAP)
MAKE_ARGS+=CXXFLAGS+=-fbracket-depth=512

		gcc${SUFFIX}/gccint \
		gcc${SUFFIX}/gfortran \
		gcc${SUFFIX}/libgomp
.if ${ARCH} == amd64 || ${ARCH} == i386
INFO+=		gcc${SUFFIX}/libquadmath \
		gcc${SUFFIX}/libitm
.endif




DIST_VERSION=	${PORTVERSION:C/([0-9]+).*\.s([0-9]+)/\1-\2/}
GCC_VERSION=	${PORTVERSION:C/(.+)\.s[0-9]{8}/\1/}
SUFFIX=		${PORTVERSION:C/([0-9]+).*/\1/}
ONLY_FOR_ARCHS=	aarch64 amd64 arm armv6 armv7 i386 powerpc powerpc64 sparc64
USES=		compiler cpe gmake iconv libtool makeinfo perl5 tar:xz
USE_BINUTILS=	yes
USE_PERL5=	build


.include <bsd.port.pre.mk>

.if ${ARCH} == amd64
CONFIGURE_TARGET=	x86_64-portbld-${OPSYS:tl}${OSREL}
.endif


USE_GCC=	yes
.endif

.if ${ARCH} == armv6 || ${ARCH} == armv7
. if ${COMPILER_TYPE} == clang
.  if empty(PORT_OPTIONS:MBOOTSTRAP)
MAKE_ARGS+=CXXFLAGS=-fbracket-depth=512

		gcc${SUFFIX}/gccint \
		gcc${SUFFIX}/gfortran \
		gcc${SUFFIX}/libgomp
.if ${ARCH} == amd64 || ${ARCH} == i386
INFO+=		gcc${SUFFIX}/libquadmath \
		gcc${SUFFIX}/libitm
.endif

Return to bug 221905

Lines 29-35 Link Here

(-)lang/gcc5/Makefile (-4 / +4 lines)
29		29
30	GCC_VERSION= ${PORTVERSION}	30	GCC_VERSION= ${PORTVERSION}
31	SUFFIX= ${PORTVERSION:C/([0-9]+).*/\1/}	31	SUFFIX= ${PORTVERSION:C/([0-9]+).*/\1/}
32	ONLY_FOR_ARCHS= aarch64 amd64 arm armv6 i386 powerpc powerpc64 sparc64	32	ONLY_FOR_ARCHS= aarch64 amd64 arm armv6 armv7 i386 powerpc powerpc64 sparc64
33	USES= compiler cpe gmake iconv libtool makeinfo perl5 tar:bzip2	33	USES= compiler cpe gmake iconv libtool makeinfo perl5 tar:bzip2
34	USE_BINUTILS= yes	34	USE_BINUTILS= yes
35	USE_PERL5= build	35	USE_PERL5= build
Lines 60-66 Link Here
60		60
61	.include <bsd.port.pre.mk>	61	.include <bsd.port.pre.mk>
62		62
63	.if ${ARCH} == "amd64"	63	.if ${ARCH} == amd64
64	CONFIGURE_TARGET= x86_64-portbld-${OPSYS:tl}${OSREL}	64	CONFIGURE_TARGET= x86_64-portbld-${OPSYS:tl}${OSREL}
65	.endif	65	.endif
66		66
Lines 68-74 Link Here
68	CONFIGURE_ENV+= UNAME_m="powerpc64"	68	CONFIGURE_ENV+= UNAME_m="powerpc64"
69	.endif	69	.endif
70		70
71	.if ${ARCH} == "aarch64" \|\| ${ARCH} == "armv6"	71	.if ${ARCH} == aarch64 \|\| ${ARCH} == armv6 \|\| ${ARCH} == armv7
72	. if ${COMPILER_TYPE} == clang	72	. if ${COMPILER_TYPE} == clang
73	. if empty(PORT_OPTIONS:MBOOTSTRAP)	73	. if empty(PORT_OPTIONS:MBOOTSTRAP)
74	MAKE_ARGS+=CXXFLAGS=-fbracket-depth=512	74	MAKE_ARGS+=CXXFLAGS=-fbracket-depth=512
Lines 115-121 Link Here
115	gcc${SUFFIX}/gfortran \	115	gcc${SUFFIX}/gfortran \
116	gcc${SUFFIX}/libgomp	116	gcc${SUFFIX}/libgomp
117	# Release tarballs (as opposed to snapshots) always carry this.	117	# Release tarballs (as opposed to snapshots) always carry this.
118	#.if ${ARCH} == "amd64" \|\| ${ARCH} == "i386"	118	#.if ${ARCH} == amd64 \|\| ${ARCH} == i386
119	INFO+= gcc${SUFFIX}/libquadmath \	119	INFO+= gcc${SUFFIX}/libquadmath \
120	gcc${SUFFIX}/libitm	120	gcc${SUFFIX}/libitm
121	#.endif	121	#.endif

Lines 1-7 Link Here

(-)lang/gcc5/files/patch-disable-armvhf-config.gcc (-5 / +9 lines)
1	--- UTC	1	--- gcc/config.gcc.orig 2017-08-28 14:39:10.252636684 +0000
2	--- gcc/config.gcc.orig 2017-04-03 17:14:32.217141000 +0200	2	+++ gcc/config.gcc 2017-08-28 14:40:31.747542221 +0000
3	+++ gcc/config.gcc 2017-04-03 17:15:05.626375000 +0200	3	@@ -1031,11 +1031,14 @@
4	@@ -1026,11 +1026,9 @@
5	case $target in	4	case $target in
6	armv6--freebsd*)	5	armv6--freebsd*)
7	tm_defines="${tm_defines} TARGET_FREEBSD_ARMv6=1"	6	tm_defines="${tm_defines} TARGET_FREEBSD_ARMv6=1"
Lines 12-18 Link Here
12	- tm_defines="${tm_defines} TARGET_FREEBSD_ARM_HARD_FLOAT=1"	11	- tm_defines="${tm_defines} TARGET_FREEBSD_ARM_HARD_FLOAT=1"
13	+ if test $fbsd_major -ge 11; then	12	+ if test $fbsd_major -ge 11; then
14	+ tm_defines="${tm_defines} TARGET_FREEBSD_ARM_HARD_FLOAT=1"	13	+ tm_defines="${tm_defines} TARGET_FREEBSD_ARM_HARD_FLOAT=1"
15	+ fi	14	+ fi
		15	+ ;;
		16	+ armv7--freebsd*)
		17	+ tm_defines="${tm_defines} TARGET_FREEBSD_ARMv7=1"
		18	+ tm_defines="${tm_defines} TARGET_FREEBSD_ARM_HARD_FLOAT=1"
		19	+ fi
16	;;	20	;;
17	esac	21	esac
18	with_tls=${with_tls:-gnu}	22	with_tls=${with_tls:-gnu}

Lines 36-41 Link Here

(-)lang/gcc5-devel/Makefile (-3 / +4 lines)
36	DIST_VERSION= ${PORTVERSION:C/([0-9]+).*\.s([0-9]+)/\1-\2/}	36	DIST_VERSION= ${PORTVERSION:C/([0-9]+).*\.s([0-9]+)/\1-\2/}
37	GCC_VERSION= ${PORTVERSION:C/(.+)\.s[0-9]{8}/\1/}	37	GCC_VERSION= ${PORTVERSION:C/(.+)\.s[0-9]{8}/\1/}
38	SUFFIX= ${PORTVERSION:C/([0-9]+).*/\1/}	38	SUFFIX= ${PORTVERSION:C/([0-9]+).*/\1/}
		39	ONLY_FOR_ARCHS= aarch64 amd64 arm armv6 armv7 i386 powerpc powerpc64 sparc64
39	USES= compiler cpe gmake iconv libtool makeinfo perl5 tar:xz	40	USES= compiler cpe gmake iconv libtool makeinfo perl5 tar:xz
40	USE_BINUTILS= yes	41	USE_BINUTILS= yes
41	USE_PERL5= build	42	USE_PERL5= build
Lines 64-70 Link Here
64		65
65	.include <bsd.port.pre.mk>	66	.include <bsd.port.pre.mk>
66		67
67	.if ${ARCH} == "amd64"	68	.if ${ARCH} == amd64
68	CONFIGURE_TARGET= x86_64-portbld-${OPSYS:tl}${OSREL}	69	CONFIGURE_TARGET= x86_64-portbld-${OPSYS:tl}${OSREL}
69	.endif	70	.endif
70		71
Lines 72-78 Link Here
72	CONFIGURE_ENV+= UNAME_m="powerpc64"	73	CONFIGURE_ENV+= UNAME_m="powerpc64"
73	.endif	74	.endif
74		75
75	.if ${ARCH} == "armv6" \|\| ${ARCH} == "aarch64"	76	.if ${ARCH} == aarch64 \|\| ${ARCH} == armv6 \|\| ${ARCH} == armv7
76	. if ${COMPILER_TYPE} == clang	77	. if ${COMPILER_TYPE} == clang
77	. if empty(PORT_OPTIONS:MBOOTSTRAP)	78	. if empty(PORT_OPTIONS:MBOOTSTRAP)
78	MAKE_ARGS+=CXXFLAGS+=-fbracket-depth=512	79	MAKE_ARGS+=CXXFLAGS+=-fbracket-depth=512
Lines 117-123 Link Here
117	gcc${SUFFIX}/gccint \	118	gcc${SUFFIX}/gccint \
118	gcc${SUFFIX}/gfortran \	119	gcc${SUFFIX}/gfortran \
119	gcc${SUFFIX}/libgomp	120	gcc${SUFFIX}/libgomp
120	.if ${ARCH} == "i386" \|\| ${ARCH} == "amd64"	121	.if ${ARCH} == amd64 \|\| ${ARCH} == i386
121	INFO+= gcc${SUFFIX}/libquadmath \	122	INFO+= gcc${SUFFIX}/libquadmath \
122	gcc${SUFFIX}/libitm	123	gcc${SUFFIX}/libitm
123	.endif	124	.endif

Lines 29-35 Link Here

(-)lang/gcc6/Makefile (-4 / +4 lines)
29		29
30	GCC_VERSION= ${PORTVERSION}	30	GCC_VERSION= ${PORTVERSION}
31	SUFFIX= ${PORTVERSION:C/([0-9]+).*/\1/}	31	SUFFIX= ${PORTVERSION:C/([0-9]+).*/\1/}
32	ONLY_FOR_ARCHS= aarch64 amd64 arm armv6 i386 powerpc powerpc64 sparc64	32	ONLY_FOR_ARCHS= aarch64 amd64 arm armv6 armv7 i386 powerpc powerpc64 sparc64
33	USES= compiler cpe gmake iconv libtool makeinfo perl5 tar:xz	33	USES= compiler cpe gmake iconv libtool makeinfo perl5 tar:xz
34	USE_BINUTILS= yes	34	USE_BINUTILS= yes
35	USE_PERL5= build	35	USE_PERL5= build
Lines 61-67 Link Here
61		61
62	.include <bsd.port.pre.mk>	62	.include <bsd.port.pre.mk>
63		63
64	.if ${ARCH} == "amd64"	64	.if ${ARCH} == amd64
65	CONFIGURE_TARGET= x86_64-portbld-${OPSYS:tl}${OSREL}	65	CONFIGURE_TARGET= x86_64-portbld-${OPSYS:tl}${OSREL}
66	.endif	66	.endif
67		67
Lines 70-76 Link Here
70	USE_GCC= 5 # Cannot require ourselves, needs to be at least 4.9.	70	USE_GCC= 5 # Cannot require ourselves, needs to be at least 4.9.
71	.endif	71	.endif
72		72
73	.if ${ARCH} == "aarch64" \|\| ${ARCH} == "armv6"	73	.if ${ARCH} == aarch64 \|\| ${ARCH} == armv6 \|\| ${ARCH} == armv7
74	. if ${COMPILER_TYPE} == clang	74	. if ${COMPILER_TYPE} == clang
75	. if empty(PORT_OPTIONS:MBOOTSTRAP)	75	. if empty(PORT_OPTIONS:MBOOTSTRAP)
76	MAKE_ARGS+=CXXFLAGS=-fbracket-depth=512	76	MAKE_ARGS+=CXXFLAGS=-fbracket-depth=512
Lines 116-122 Link Here
116	gcc${SUFFIX}/gfortran \	116	gcc${SUFFIX}/gfortran \
117	gcc${SUFFIX}/libgomp	117	gcc${SUFFIX}/libgomp
118	# Release tarballs (as opposed to snapshots) always carry this.	118	# Release tarballs (as opposed to snapshots) always carry this.
119	#.if ${ARCH} == "amd64" \|\| ${ARCH} == "i386"	119	#.if ${ARCH} == amd64 \|\| ${ARCH} == i386
120	INFO+= gcc${SUFFIX}/libquadmath \	120	INFO+= gcc${SUFFIX}/libquadmath \
121	gcc${SUFFIX}/libitm	121	gcc${SUFFIX}/libitm
122	#.endif	122	#.endif

Lines 34-40 Link Here

(-)lang/gcc6-devel/Makefile (-4 / +4 lines)
34	DIST_VERSION= ${PORTVERSION:C/([0-9]+).*\.s([0-9]+)/\1-\2/}	34	DIST_VERSION= ${PORTVERSION:C/([0-9]+).*\.s([0-9]+)/\1-\2/}
35	GCC_VERSION= ${PORTVERSION:C/(.+)\.s[0-9]{8}/\1/}	35	GCC_VERSION= ${PORTVERSION:C/(.+)\.s[0-9]{8}/\1/}
36	SUFFIX= ${PORTVERSION:C/([0-9]+).*/\1/}	36	SUFFIX= ${PORTVERSION:C/([0-9]+).*/\1/}
37	ONLY_FOR_ARCHS= aarch64 amd64 arm armv6 i386 powerpc powerpc64 sparc64	37	ONLY_FOR_ARCHS= aarch64 amd64 arm armv6 armv7 i386 powerpc powerpc64 sparc64
38	USES= compiler cpe gmake iconv libtool makeinfo perl5 tar:xz	38	USES= compiler cpe gmake iconv libtool makeinfo perl5 tar:xz
39	USE_BINUTILS= yes	39	USE_BINUTILS= yes
40	USE_PERL5= build	40	USE_PERL5= build
Lines 63-69 Link Here
63		63
64	.include <bsd.port.pre.mk>	64	.include <bsd.port.pre.mk>
65		65
66	.if ${ARCH} == "amd64"	66	.if ${ARCH} == amd64
67	CONFIGURE_TARGET= x86_64-portbld-${OPSYS:tl}${OSREL}	67	CONFIGURE_TARGET= x86_64-portbld-${OPSYS:tl}${OSREL}
68	.endif	68	.endif
69		69
Lines 72-78 Link Here
72	USE_GCC= 5 # Cannot require ourselves, needs to be at least 4.9.	72	USE_GCC= 5 # Cannot require ourselves, needs to be at least 4.9.
73	.endif	73	.endif
74		74
75	.if ${ARCH} == "aarch64" \|\| ${ARCH} == "armv6"	75	.if ${ARCH} == aarch64 \|\| ${ARCH} == armv6 \|\| ${ARCH} == armv7
76	. if ${COMPILER_TYPE} == clang	76	. if ${COMPILER_TYPE} == clang
77	. if empty(PORT_OPTIONS:MBOOTSTRAP)	77	. if empty(PORT_OPTIONS:MBOOTSTRAP)
78	MAKE_ARGS+=CXXFLAGS=-fbracket-depth=512	78	MAKE_ARGS+=CXXFLAGS=-fbracket-depth=512
Lines 117-123 Link Here
117	gcc${SUFFIX}/gccint \	117	gcc${SUFFIX}/gccint \
118	gcc${SUFFIX}/gfortran \	118	gcc${SUFFIX}/gfortran \
119	gcc${SUFFIX}/libgomp	119	gcc${SUFFIX}/libgomp
120	.if ${ARCH} == "amd64" \|\| ${ARCH} == "i386"	120	.if ${ARCH} == amd64 \|\| ${ARCH} == i386
121	INFO+= gcc${SUFFIX}/libquadmath \	121	INFO+= gcc${SUFFIX}/libquadmath \
122	gcc${SUFFIX}/libitm	122	gcc${SUFFIX}/libitm
123	.endif	123	.endif

Lines 49-55 Link Here

(-)lang/gcc7/Makefile (-3 / +3 lines)
49		49
50	.include <bsd.port.pre.mk>	50	.include <bsd.port.pre.mk>
51		51
52	.if ${ARCH} == "amd64"	52	.if ${ARCH} == amd64
53	CONFIGURE_TARGET= x86_64-portbld-${OPSYS:tl}${OSREL}	53	CONFIGURE_TARGET= x86_64-portbld-${OPSYS:tl}${OSREL}
54	.endif	54	.endif
55		55
Lines 58-64 Link Here
58	USE_GCC= yes	58	USE_GCC= yes
59	.endif	59	.endif
60		60
61	.if ${ARCH} == "armv6"	61	.if ${ARCH} == armv6 \|\| ${ARCH} == armv7
62	. if ${COMPILER_TYPE} == clang	62	. if ${COMPILER_TYPE} == clang
63	. if empty(PORT_OPTIONS:MBOOTSTRAP)	63	. if empty(PORT_OPTIONS:MBOOTSTRAP)
64	MAKE_ARGS+=CXXFLAGS+=-fbracket-depth=512	64	MAKE_ARGS+=CXXFLAGS+=-fbracket-depth=512
Lines 104-110 Link Here
104	gcc${SUFFIX}/gfortran \	104	gcc${SUFFIX}/gfortran \
105	gcc${SUFFIX}/libgomp	105	gcc${SUFFIX}/libgomp
106	# Release tarballs (as opposed to snapshots) always carry this.	106	# Release tarballs (as opposed to snapshots) always carry this.
107	#.if ${ARCH} == "amd64" \|\| ${ARCH} == "i386"	107	#.if ${ARCH} == amd64 \|\| ${ARCH} == i386
108	INFO+= gcc${SUFFIX}/libquadmath \	108	INFO+= gcc${SUFFIX}/libquadmath \
109	gcc${SUFFIX}/libitm	109	gcc${SUFFIX}/libitm
110	#.endif	110	#.endif

Lines 14-20 Link Here

(-)lang/gcc7-devel/Makefile (-4 / +4 lines)
14	LICENSE= GPLv3 GPLv3RLE	14	LICENSE= GPLv3 GPLv3RLE
15	LICENSE_COMB= multi	15	LICENSE_COMB= multi
16		16
17	ONLY_FOR_ARCHS= aarch64 amd64 arm armv6 i386 powerpc powerpc64 sparc64	17	ONLY_FOR_ARCHS= aarch64 amd64 arm armv6 armv7 i386 powerpc powerpc64 sparc64
18	LIB_DEPENDS= libgmp.so:math/gmp \	18	LIB_DEPENDS= libgmp.so:math/gmp \
19	libmpfr.so:math/mpfr \	19	libmpfr.so:math/mpfr \
20	libmpc.so:math/mpc	20	libmpc.so:math/mpc
Lines 56-62 Link Here
56		56
57	.include <bsd.port.pre.mk>	57	.include <bsd.port.pre.mk>
58		58
59	.if ${ARCH} == "amd64"	59	.if ${ARCH} == amd64
60	CONFIGURE_TARGET= x86_64-portbld-${OPSYS:tl}${OSREL}	60	CONFIGURE_TARGET= x86_64-portbld-${OPSYS:tl}${OSREL}
61	.endif	61	.endif
62		62
Lines 65-71 Link Here
65	USE_GCC= yes	65	USE_GCC= yes
66	.endif	66	.endif
67		67
68	.if ${ARCH} == "armv6"	68	.if ${ARCH} == armv6 \|\| ${ARCH} == armv7
69	. if ${COMPILER_TYPE} == clang	69	. if ${COMPILER_TYPE} == clang
70	. if empty(PORT_OPTIONS:MBOOTSTRAP)	70	. if empty(PORT_OPTIONS:MBOOTSTRAP)
71	MAKE_ARGS+=CXXFLAGS+=-fbracket-depth=512	71	MAKE_ARGS+=CXXFLAGS+=-fbracket-depth=512
Lines 110-116 Link Here
110	gcc${SUFFIX}/gccint \	110	gcc${SUFFIX}/gccint \
111	gcc${SUFFIX}/gfortran \	111	gcc${SUFFIX}/gfortran \
112	gcc${SUFFIX}/libgomp	112	gcc${SUFFIX}/libgomp
113	.if ${ARCH} == "amd64" \|\| ${ARCH} == "i386"	113	.if ${ARCH} == amd64 \|\| ${ARCH} == i386
114	INFO+= gcc${SUFFIX}/libquadmath \	114	INFO+= gcc${SUFFIX}/libquadmath \
115	gcc${SUFFIX}/libitm	115	gcc${SUFFIX}/libitm
116	.endif	116	.endif

Lines 35-40 Link Here

(-)lang/gcc8-devel/Makefile (-3 / +4 lines)
35	DIST_VERSION= ${PORTVERSION:C/([0-9]+).*\.s([0-9]+)/\1-\2/}	35	DIST_VERSION= ${PORTVERSION:C/([0-9]+).*\.s([0-9]+)/\1-\2/}
36	GCC_VERSION= ${PORTVERSION:C/(.+)\.s[0-9]{8}/\1/}	36	GCC_VERSION= ${PORTVERSION:C/(.+)\.s[0-9]{8}/\1/}
37	SUFFIX= ${PORTVERSION:C/([0-9]+).*/\1/}	37	SUFFIX= ${PORTVERSION:C/([0-9]+).*/\1/}
		38	ONLY_FOR_ARCHS= aarch64 amd64 arm armv6 armv7 i386 powerpc powerpc64 sparc64
38	USES= compiler cpe gmake iconv libtool makeinfo perl5 tar:xz	39	USES= compiler cpe gmake iconv libtool makeinfo perl5 tar:xz
39	USE_BINUTILS= yes	40	USE_BINUTILS= yes
40	USE_PERL5= build	41	USE_PERL5= build
Lines 56-62 Link Here
56		57
57	.include <bsd.port.pre.mk>	58	.include <bsd.port.pre.mk>
58		59
59	.if ${ARCH} == "amd64"	60	.if ${ARCH} == amd64
60	CONFIGURE_TARGET= x86_64-portbld-${OPSYS:tl}${OSREL}	61	CONFIGURE_TARGET= x86_64-portbld-${OPSYS:tl}${OSREL}
61	.endif	62	.endif
62		63
Lines 65-71 Link Here
65	USE_GCC= yes	66	USE_GCC= yes
66	.endif	67	.endif
67		68
68	.if ${ARCH} == "armv6"	69	.if ${ARCH} == armv6 \|\| ${ARCH} == armv7
69	. if ${COMPILER_TYPE} == clang	70	. if ${COMPILER_TYPE} == clang
70	. if empty(PORT_OPTIONS:MBOOTSTRAP)	71	. if empty(PORT_OPTIONS:MBOOTSTRAP)
71	MAKE_ARGS+=CXXFLAGS=-fbracket-depth=512	72	MAKE_ARGS+=CXXFLAGS=-fbracket-depth=512
Lines 110-116 Link Here
110	gcc${SUFFIX}/gccint \	111	gcc${SUFFIX}/gccint \
111	gcc${SUFFIX}/gfortran \	112	gcc${SUFFIX}/gfortran \
112	gcc${SUFFIX}/libgomp	113	gcc${SUFFIX}/libgomp
113	.if ${ARCH} == "amd64" \|\| ${ARCH} == "i386"	114	.if ${ARCH} == amd64 \|\| ${ARCH} == i386
114	INFO+= gcc${SUFFIX}/libquadmath \	115	INFO+= gcc${SUFFIX}/libquadmath \
115	gcc${SUFFIX}/libitm	116	gcc${SUFFIX}/libitm
116	.endif	117	.endif