Index: lang/gcc48/Makefile =================================================================== --- lang/gcc48/Makefile (revision 448901) +++ lang/gcc48/Makefile (working copy) @@ -30,7 +30,7 @@ # once installed. GCC_VERSION= ${PORTVERSION} SUFFIX= ${PORTVERSION:C/([0-9]+).([0-9]+).*/\1\2/} -ONLY_FOR_ARCHS= amd64 armv6 i386 powerpc powerpc64 sparc64 +ONLY_FOR_ARCHS= amd64 armv6 armv7 i386 powerpc powerpc64 sparc64 USES= compiler cpe gmake iconv libtool makeinfo perl5 tar:bzip2 USE_BINUTILS= yes USE_PERL5= build @@ -59,7 +59,7 @@ CONFIGURE_ENV+= UNAME_m="powerpc64" .endif -.if ${ARCH} == "armv6" +.if ${ARCH} == armv6 || ${ARCH} == armv7 # Override sys.mk including -O in CFLAGS which breaks libgomp building. CFLAGS:= ${CFLAGS:S/-O/-O2/g} . if ${COMPILER_TYPE} == clang Index: lang/gcc48/files/patch-arm-support =================================================================== --- lang/gcc48/files/patch-arm-support (revision 448901) +++ lang/gcc48/files/patch-arm-support (working copy) @@ -230,8 +230,8 @@ \ No newline at end of property Index: gcc/config.gcc =================================================================== ---- gcc/config.gcc (revision 218760) -+++ gcc/config.gcc (working copy) +--- gcc/config.gcc.orig 2015-05-21 20:57:29.000000000 +0000 ++++ gcc/config.gcc 2017-08-28 15:07:25.941158130 +0000 @@ -267,7 +267,6 @@ arm*-wince-pe* \ | arm*-*-ecos-elf \ @@ -240,7 +240,7 @@ | arm*-*-linux* \ | arm*-*-uclinux* \ | i[34567]86-go32-* \ -@@ -865,6 +864,28 @@ +@@ -865,6 +864,32 @@ extra_options="${extra_options} arm/vxworks.opt" tmake_file="${tmake_file} arm/t-arm arm/t-vxworks" ;; @@ -257,6 +257,10 @@ + armv6*-*-freebsd*) + tm_defines="${tm_defines} TARGET_FREEBSD_ARMv6=1" + ;; ++ armv7*-*-freebsd*) ++ tm_defines="${tm_defines} TARGET_FREEBSD_ARMv7=1" ++ tm_defines="${tm_defines} TARGET_FREEBSD_ARM_HARD_FLOAT=1" ++ ;; + esac + case $target in + arm*hf-*-freebsd*) Index: lang/gcc49/Makefile =================================================================== --- lang/gcc49/Makefile (revision 448901) +++ lang/gcc49/Makefile (working copy) @@ -30,7 +30,7 @@ # once installed. GCC_VERSION= ${PORTVERSION} SUFFIX= ${PORTVERSION:C/([0-9]+).([0-9]+).*/\1\2/} -ONLY_FOR_ARCHS= amd64 armv6 i386 powerpc powerpc64 sparc64 +ONLY_FOR_ARCHS= amd64 armv6 armv7 i386 powerpc powerpc64 sparc64 USES= compiler cpe gmake iconv libtool makeinfo perl5 tar:bzip2 USE_BINUTILS= yes USE_PERL5= build @@ -59,7 +59,7 @@ CONFIGURE_ENV+= UNAME_m="powerpc64" .endif -.if ${ARCH} == "armv6" +.if ${ARCH} == armv6 || ${ARCH} == armv7 # Override sys.mk including -O in CFLAGS which breaks libgomp building. CFLAGS:= ${CFLAGS:S/-O/-O2/g} . if ${COMPILER_TYPE} == clang Index: lang/gcc49/files/patch-arm-support =================================================================== --- lang/gcc49/files/patch-arm-support (revision 448901) +++ lang/gcc49/files/patch-arm-support (working copy) @@ -258,9 +258,9 @@ \ No newline at end of property Index: gcc/config.gcc =================================================================== ---- gcc/config.gcc (revision 218760) -+++ gcc/config.gcc (working copy) -@@ -267,7 +267,6 @@ +--- gcc/config.gcc.orig 2016-03-14 10:03:12.000000000 +0000 ++++ gcc/config.gcc 2017-08-28 14:49:38.426853558 +0000 +@@ -268,7 +268,6 @@ arm*-wince-pe* \ | arm*-*-ecos-elf \ | arm*-*-elf \ @@ -268,7 +268,7 @@ | arm*-*-linux* \ | arm*-*-uclinux* \ | i[34567]86-go32-* \ -@@ -865,6 +864,28 @@ +@@ -1013,6 +1012,32 @@ extra_options="${extra_options} arm/vxworks.opt" tmake_file="${tmake_file} arm/t-arm arm/t-vxworks" ;; @@ -285,6 +285,10 @@ + armv6*-*-freebsd*) + tm_defines="${tm_defines} TARGET_FREEBSD_ARMv6=1" + ;; ++ armv7*-*-freebsd*) ++ tm_defines="${tm_defines} TARGET_FREEBSD_ARMv7=1" ++ tm_defines="${tm_defines} TARGET_FREEBSD_ARM_HARD_FLOAT=1" ++ ;; + esac + case $target in + arm*hf-*-freebsd*) Index: lang/gcc5/Makefile =================================================================== --- lang/gcc5/Makefile (revision 448901) +++ lang/gcc5/Makefile (working copy) @@ -29,7 +29,7 @@ GCC_VERSION= ${PORTVERSION} SUFFIX= ${PORTVERSION:C/([0-9]+).*/\1/} -ONLY_FOR_ARCHS= aarch64 amd64 arm armv6 i386 powerpc powerpc64 sparc64 +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 @@ -60,7 +60,7 @@ .include -.if ${ARCH} == "amd64" +.if ${ARCH} == amd64 CONFIGURE_TARGET= x86_64-portbld-${OPSYS:tl}${OSREL} .endif @@ -68,7 +68,7 @@ CONFIGURE_ENV+= UNAME_m="powerpc64" .endif -.if ${ARCH} == "aarch64" || ${ARCH} == "armv6" +.if ${ARCH} == aarch64 || ${ARCH} == armv6 || ${ARCH} == armv7 . if ${COMPILER_TYPE} == clang . if empty(PORT_OPTIONS:MBOOTSTRAP) MAKE_ARGS+=CXXFLAGS=-fbracket-depth=512 @@ -115,7 +115,7 @@ gcc${SUFFIX}/gfortran \ gcc${SUFFIX}/libgomp # Release tarballs (as opposed to snapshots) always carry this. -#.if ${ARCH} == "amd64" || ${ARCH} == "i386" +#.if ${ARCH} == amd64 || ${ARCH} == i386 INFO+= gcc${SUFFIX}/libquadmath \ gcc${SUFFIX}/libitm #.endif Index: lang/gcc5/files/patch-disable-armvhf-config.gcc =================================================================== --- lang/gcc5/files/patch-disable-armvhf-config.gcc (revision 448901) +++ lang/gcc5/files/patch-disable-armvhf-config.gcc (working copy) @@ -1,7 +1,6 @@ ---- UTC ---- gcc/config.gcc.orig 2017-04-03 17:14:32.217141000 +0200 -+++ gcc/config.gcc 2017-04-03 17:15:05.626375000 +0200 -@@ -1026,11 +1026,9 @@ +--- 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 @@ case $target in armv6*-*-freebsd*) tm_defines="${tm_defines} TARGET_FREEBSD_ARMv6=1" @@ -12,7 +11,12 @@ - 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 ++ 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} Index: lang/gcc5-devel/Makefile =================================================================== --- lang/gcc5-devel/Makefile (revision 448901) +++ lang/gcc5-devel/Makefile (working copy) @@ -36,6 +36,7 @@ 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 @@ -64,7 +65,7 @@ .include -.if ${ARCH} == "amd64" +.if ${ARCH} == amd64 CONFIGURE_TARGET= x86_64-portbld-${OPSYS:tl}${OSREL} .endif @@ -72,7 +73,7 @@ CONFIGURE_ENV+= UNAME_m="powerpc64" .endif -.if ${ARCH} == "armv6" || ${ARCH} == "aarch64" +.if ${ARCH} == aarch64 || ${ARCH} == armv6 || ${ARCH} == armv7 . if ${COMPILER_TYPE} == clang . if empty(PORT_OPTIONS:MBOOTSTRAP) MAKE_ARGS+=CXXFLAGS+=-fbracket-depth=512 @@ -117,7 +118,7 @@ gcc${SUFFIX}/gccint \ gcc${SUFFIX}/gfortran \ gcc${SUFFIX}/libgomp -.if ${ARCH} == "i386" || ${ARCH} == "amd64" +.if ${ARCH} == amd64 || ${ARCH} == i386 INFO+= gcc${SUFFIX}/libquadmath \ gcc${SUFFIX}/libitm .endif Index: lang/gcc6/Makefile =================================================================== --- lang/gcc6/Makefile (revision 448901) +++ lang/gcc6/Makefile (working copy) @@ -29,7 +29,7 @@ GCC_VERSION= ${PORTVERSION} SUFFIX= ${PORTVERSION:C/([0-9]+).*/\1/} -ONLY_FOR_ARCHS= aarch64 amd64 arm armv6 i386 powerpc powerpc64 sparc64 +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 @@ -61,7 +61,7 @@ .include -.if ${ARCH} == "amd64" +.if ${ARCH} == amd64 CONFIGURE_TARGET= x86_64-portbld-${OPSYS:tl}${OSREL} .endif @@ -70,7 +70,7 @@ USE_GCC= 5 # Cannot require ourselves, needs to be at least 4.9. .endif -.if ${ARCH} == "aarch64" || ${ARCH} == "armv6" +.if ${ARCH} == aarch64 || ${ARCH} == armv6 || ${ARCH} == armv7 . if ${COMPILER_TYPE} == clang . if empty(PORT_OPTIONS:MBOOTSTRAP) MAKE_ARGS+=CXXFLAGS=-fbracket-depth=512 @@ -116,7 +116,7 @@ gcc${SUFFIX}/gfortran \ gcc${SUFFIX}/libgomp # Release tarballs (as opposed to snapshots) always carry this. -#.if ${ARCH} == "amd64" || ${ARCH} == "i386" +#.if ${ARCH} == amd64 || ${ARCH} == i386 INFO+= gcc${SUFFIX}/libquadmath \ gcc${SUFFIX}/libitm #.endif Index: lang/gcc6-devel/Makefile =================================================================== --- lang/gcc6-devel/Makefile (revision 448901) +++ lang/gcc6-devel/Makefile (working copy) @@ -34,7 +34,7 @@ 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 i386 powerpc powerpc64 sparc64 +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 @@ -63,7 +63,7 @@ .include -.if ${ARCH} == "amd64" +.if ${ARCH} == amd64 CONFIGURE_TARGET= x86_64-portbld-${OPSYS:tl}${OSREL} .endif @@ -72,7 +72,7 @@ USE_GCC= 5 # Cannot require ourselves, needs to be at least 4.9. .endif -.if ${ARCH} == "aarch64" || ${ARCH} == "armv6" +.if ${ARCH} == aarch64 || ${ARCH} == armv6 || ${ARCH} == armv7 . if ${COMPILER_TYPE} == clang . if empty(PORT_OPTIONS:MBOOTSTRAP) MAKE_ARGS+=CXXFLAGS=-fbracket-depth=512 @@ -117,7 +117,7 @@ gcc${SUFFIX}/gccint \ gcc${SUFFIX}/gfortran \ gcc${SUFFIX}/libgomp -.if ${ARCH} == "amd64" || ${ARCH} == "i386" +.if ${ARCH} == amd64 || ${ARCH} == i386 INFO+= gcc${SUFFIX}/libquadmath \ gcc${SUFFIX}/libitm .endif Index: lang/gcc7/Makefile =================================================================== --- lang/gcc7/Makefile (revision 448901) +++ lang/gcc7/Makefile (working copy) @@ -49,7 +49,7 @@ .include -.if ${ARCH} == "amd64" +.if ${ARCH} == amd64 CONFIGURE_TARGET= x86_64-portbld-${OPSYS:tl}${OSREL} .endif @@ -58,7 +58,7 @@ USE_GCC= yes .endif -.if ${ARCH} == "armv6" +.if ${ARCH} == armv6 || ${ARCH} == armv7 . if ${COMPILER_TYPE} == clang . if empty(PORT_OPTIONS:MBOOTSTRAP) MAKE_ARGS+=CXXFLAGS+=-fbracket-depth=512 @@ -104,7 +104,7 @@ gcc${SUFFIX}/gfortran \ gcc${SUFFIX}/libgomp # Release tarballs (as opposed to snapshots) always carry this. -#.if ${ARCH} == "amd64" || ${ARCH} == "i386" +#.if ${ARCH} == amd64 || ${ARCH} == i386 INFO+= gcc${SUFFIX}/libquadmath \ gcc${SUFFIX}/libitm #.endif Index: lang/gcc7-devel/Makefile =================================================================== --- lang/gcc7-devel/Makefile (revision 448901) +++ lang/gcc7-devel/Makefile (working copy) @@ -14,7 +14,7 @@ LICENSE= GPLv3 GPLv3RLE LICENSE_COMB= multi -ONLY_FOR_ARCHS= aarch64 amd64 arm armv6 i386 powerpc powerpc64 sparc64 +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 @@ -56,7 +56,7 @@ .include -.if ${ARCH} == "amd64" +.if ${ARCH} == amd64 CONFIGURE_TARGET= x86_64-portbld-${OPSYS:tl}${OSREL} .endif @@ -65,7 +65,7 @@ USE_GCC= yes .endif -.if ${ARCH} == "armv6" +.if ${ARCH} == armv6 || ${ARCH} == armv7 . if ${COMPILER_TYPE} == clang . if empty(PORT_OPTIONS:MBOOTSTRAP) MAKE_ARGS+=CXXFLAGS+=-fbracket-depth=512 @@ -110,7 +110,7 @@ gcc${SUFFIX}/gccint \ gcc${SUFFIX}/gfortran \ gcc${SUFFIX}/libgomp -.if ${ARCH} == "amd64" || ${ARCH} == "i386" +.if ${ARCH} == amd64 || ${ARCH} == i386 INFO+= gcc${SUFFIX}/libquadmath \ gcc${SUFFIX}/libitm .endif Index: lang/gcc8-devel/Makefile =================================================================== --- lang/gcc8-devel/Makefile (revision 448901) +++ lang/gcc8-devel/Makefile (working copy) @@ -35,6 +35,7 @@ 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 @@ -56,7 +57,7 @@ .include -.if ${ARCH} == "amd64" +.if ${ARCH} == amd64 CONFIGURE_TARGET= x86_64-portbld-${OPSYS:tl}${OSREL} .endif @@ -65,7 +66,7 @@ USE_GCC= yes .endif -.if ${ARCH} == "armv6" +.if ${ARCH} == armv6 || ${ARCH} == armv7 . if ${COMPILER_TYPE} == clang . if empty(PORT_OPTIONS:MBOOTSTRAP) MAKE_ARGS+=CXXFLAGS=-fbracket-depth=512 @@ -110,7 +111,7 @@ gcc${SUFFIX}/gccint \ gcc${SUFFIX}/gfortran \ gcc${SUFFIX}/libgomp -.if ${ARCH} == "amd64" || ${ARCH} == "i386" +.if ${ARCH} == amd64 || ${ARCH} == i386 INFO+= gcc${SUFFIX}/libquadmath \ gcc${SUFFIX}/libitm .endif