diff --git a/lang/gcc10/Makefile b/lang/gcc10/Makefile index d28556e821d2..22f6022bebfc 100644 --- a/lang/gcc10/Makefile +++ b/lang/gcc10/Makefile @@ -1,156 +1,155 @@ # Created by: Gerald Pfeifer PORTNAME= gcc -PORTVERSION= 10.2.0 -PORTREVISION= 1 +PORTVERSION= 10.3.0 CATEGORIES= lang MASTER_SITES= GCC PKGNAMESUFFIX= ${SUFFIX} MAINTAINER= gerald@FreeBSD.org COMMENT= GNU Compiler Collection 10 LICENSE= GPLv3 GPLv3RLE LICENSE_COMB= multi ONLY_FOR_ARCHS= aarch64 amd64 arm armv6 armv7 i386 powerpc powerpc64 powerpc64le LIB_DEPENDS= libgmp.so:math/gmp \ libmpfr.so:math/mpfr \ libmpc.so:math/mpc BUILD_DEPENDS+= ${LOCALBASE}/bin/as:devel/binutils RUN_DEPENDS+= ${LOCALBASE}/bin/as:devel/binutils .if defined(MAINTAINER_MODE) BUILD_DEPENDS+= runtest:misc/dejagnu .endif USES= compiler cpe gmake iconv libtool makeinfo perl5 tar:xz USE_BINUTILS= yes USE_PERL5= build CONFLICTS= gcc10-devel-10.* CPE_VENDOR= gnu GCC_VERSION= ${PORTVERSION} SUFFIX= ${PORTVERSION:C/([0-9]+).*/\1/} CFLAGS:= ${CFLAGS:N-mretpoline} CXXFLAGS:= ${CXXFLAGS:N-mretpoline} OPTIONS_DEFINE= BOOTSTRAP GRAPHITE OPTIONS_DEFAULT= BOOTSTRAP BOOTSTRAP_DESC= Build using a full bootstrap GRAPHITE_DESC= Support for Graphite loop optimizations .if exists(/usr/lib32/libc.so) OPTIONS_DEFINE_amd64+= MULTILIB OPTIONS_DEFAULT_amd64+= MULTILIB OPTIONS_DEFINE_powerpc64+= MULTILIB OPTIONS_DEFAULT_powerpc64+= MULTILIB MULTILIB_DESC= Build support for 32-bit and 64-bit targets MULTILIB_CONFIGURE_ENABLE= multilib .else CONFIGURE_ARGS+= --disable-multilib .endif .include .if ${ARCH} == amd64 CONFIGURE_TARGET= x86_64-portbld-${OPSYS:tl}${OSREL} .elif ${ARCH} == powerpc64 CONFIGURE_ENV+= UNAME_m="powerpc64" . if defined(PPC_ABI) && ${PPC_ABI} == ELFv2 CONFIGURE_ARGS+= --with-abi=elfv2 . else USE_GCC= 9 . endif .endif LANGUAGES:= c,c++,objc,fortran TARGLIB= ${PREFIX}/lib/gcc${SUFFIX} TARGLIB32= ${PREFIX}/lib32 # The version information is added later LIBEXEC= ${PREFIX}/libexec/gcc${SUFFIX} GNU_CONFIGURE= yes CONFIGURE_OUTSOURCE= yes .if empty(PORT_OPTIONS:MBOOTSTRAP) CONFIGURE_ARGS+=--disable-bootstrap .else CONFIGURE_ARGS+=--with-build-config=bootstrap-debug ALL_TARGET= bootstrap-lean .endif INSTALL_TARGET= install-strip .if ${UID} != 0 BINMODE= 755 .endif CONFIGURE_ARGS+=--disable-nls \ --enable-gnu-indirect-function \ --enable-plugin \ --libdir=${TARGLIB} \ --libexecdir=${LIBEXEC} \ --program-suffix=${SUFFIX} \ --with-as=${LOCALBASE}/bin/as \ --with-gmp=${LOCALBASE} \ --with-gxx-include-dir=${TARGLIB}/include/c++/ \ --with-ld=${LOCALBASE}/bin/ld \ ${ICONV_CONFIGURE_ARG} \ --with-pkgversion="FreeBSD Ports Collection" \ --with-system-zlib \ --without-zstd MAKE_ARGS+= MAKEINFOFLAGS="--no-split" USE_LDCONFIG= ${TARGLIB} PLIST_SUB+= GCC_VERSION=${GCC_VERSION} \ GNU_HOST=${CONFIGURE_TARGET} \ SUFFIX=${SUFFIX} INFO= gcc${SUFFIX}/cpp \ gcc${SUFFIX}/cppinternals \ gcc${SUFFIX}/gcc \ gcc${SUFFIX}/gccinstall \ gcc${SUFFIX}/gccint \ gcc${SUFFIX}/gfortran \ gcc${SUFFIX}/libgomp # Release tarballs (as opposed to snapshots) always carry this. INFO+= gcc${SUFFIX}/libquadmath \ gcc${SUFFIX}/libitm SUB_FILES= pkg-message SUB_LIST+= TARGLIB=${TARGLIB} .if ${PORT_OPTIONS:MGRAPHITE} LIB_DEPENDS+= libisl.so:devel/isl CONFIGURE_ARGS+=--with-isl=${LOCALBASE} .endif CONFIGURE_ARGS+=--enable-languages=${LANGUAGES} pre-everything:: @${ECHO_MSG} "Making GCC ${PORTVERSION} for ${CONFIGURE_TARGET} [${LANGUAGES}]" pre-configure: cd ${WRKSRC} ; contrib/gcc_update --touch @${RM} ${WRKSRC}/gcc/*/*.info* .if defined(MAINTAINER_MODE) full-regression-test: build cd ${TEST_WRKSRC}; ${MAKE_CMD} -sk check \ ; ${WRKSRC}/contrib/test_summary .endif post-stage: ${RM} ${STAGEDIR}${PREFIX}/man/man7/* ${RM} -r ${STAGEDIR}${TARGLIB}/gcc/*/${GCC_VERSION}/include-fixed/ # Add target libraries and include files to packaging list. ${RM} ${WRKDIR}/PLIST.lib .if (${ARCH} == amd64 || ${ARCH} == powerpc64) && ${PORT_OPTIONS:MMULTILIB} ${MKDIR} ${STAGEDIR}${TARGLIB32} ${MV} ${STAGEDIR}${PREFIX}/lib/lib32 ${STAGEDIR}${TARGLIB32}/gcc${SUFFIX} .endif .for d in ${TARGLIB:S/^${PREFIX}\///} ${TARGLIB32:S/^${PREFIX}\///} ${LIBEXEC:S/^${PREFIX}\///} cd ${STAGEDIR}${PREFIX} ; if [ -d $d ]; then \ ${FIND} $d -type f -o -type l >>${WRKDIR}/PLIST.lib ;\ fi .endfor cd ${WRKDIR} ; ${SED} -i -e "/PLIST.lib/ r PLIST.lib" ${TMPPLIST} .include diff --git a/lang/gcc10/distinfo b/lang/gcc10/distinfo index b8233036ac8c..0463ec6b5b2b 100644 --- a/lang/gcc10/distinfo +++ b/lang/gcc10/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1596200916 -SHA256 (gcc-10.2.0.tar.xz) = b8dd4368bb9c7f0b98188317ee0254dd8cc99d1e3a18d0ff146c855fe16c1d8c -SIZE (gcc-10.2.0.tar.xz) = 75004144 +TIMESTAMP = 1619249722 +SHA256 (gcc-10.3.0.tar.xz) = 64f404c1a650f27fc33da242e1f2df54952e3963a49e06e73f6940f3223ac344 +SIZE (gcc-10.3.0.tar.xz) = 76692288 diff --git a/lang/gcc10/files/patch-aarch64-c++98-fix b/lang/gcc10/files/patch-aarch64-c++98-fix deleted file mode 100644 index ec6b32b63c0c..000000000000 --- a/lang/gcc10/files/patch-aarch64-c++98-fix +++ /dev/null @@ -1,32 +0,0 @@ -Temporary back port from the GCC 10 branch until GCC 10.3 releases. - -commit 3b777ab44049e06dc0825f86a8310673cdb6498c -Author: Francois-Xavier Coudert -Date: Mon Dec 21 21:06:59 2020 +0000 - - aarch64 : Remove the use of a C++11 brace-init-list. - - Instead of using a brace-init-list, set up the member values - manually. - - gcc/ - - * config/aarch64/aarch64-builtins.c - (aarch64_init_memtag_builtins): Manually initialize instead - of using a C++11 brace-init-list. - ---- UTC ---- gcc/config/aarch64/aarch64-builtins.c -+++ gcc/config/aarch64/aarch64-builtins.c -@@ -1223,8 +1223,9 @@ aarch64_init_memtag_builtins (void) - = aarch64_general_add_builtin ("__builtin_aarch64_memtag_"#N, \ - T, AARCH64_MEMTAG_BUILTIN_##F); \ - aarch64_memtag_builtin_data[AARCH64_MEMTAG_BUILTIN_##F - \ -- AARCH64_MEMTAG_BUILTIN_START - 1] = \ -- {T, CODE_FOR_##I}; -+ AARCH64_MEMTAG_BUILTIN_START - 1].ftype = T; \ -+ aarch64_memtag_builtin_data[AARCH64_MEMTAG_BUILTIN_##F - \ -+ AARCH64_MEMTAG_BUILTIN_START - 1].icode = CODE_FOR_##I; - - fntype = build_function_type_list (ptr_type_node, ptr_type_node, - uint64_type_node, NULL); diff --git a/lang/gcc10/files/patch-libcpp_lex.c b/lang/gcc10/files/patch-libcpp_lex.c deleted file mode 100644 index 05ad28872d11..000000000000 --- a/lang/gcc10/files/patch-libcpp_lex.c +++ /dev/null @@ -1,25 +0,0 @@ -This is - - commit cd547f0ddcd3a54e5b73bcda5ac0f0c46808db8b - Author: Jakub Jelinek - Date: Sat Sep 26 10:07:41 2020 +0200 - -which is on the GCC 10 release branch and thus part of lang/gcc10-devel; -we should automatically get it with GCC 10.3. - ---- libcpp/lex.c.orig 2020-11-02 10:24:50 UTC -+++ libcpp/lex.c -@@ -531,11 +531,11 @@ init_vectorized_lexer (void) - search_line_fast = impl; - } - --#elif defined(_ARCH_PWR8) && defined(__ALTIVEC__) -+#elif (GCC_VERSION >= 4005) && defined(_ARCH_PWR8) && defined(__ALTIVEC__) - - /* A vection of the fast scanner using AltiVec vectorized byte compares - and VSX unaligned loads (when VSX is available). This is otherwise -- the same as the pre-GCC 5 version. */ -+ the same as the AltiVec version. */ - - ATTRIBUTE_NO_SANITIZE_UNDEFINED - static const uchar * diff --git a/lang/gcc10/files/patch-powerpc64le b/lang/gcc10/files/patch-powerpc64le deleted file mode 100644 index 6973c9396e09..000000000000 --- a/lang/gcc10/files/patch-powerpc64le +++ /dev/null @@ -1,77 +0,0 @@ ---- gcc/config.gcc.orig 2020-07-23 06:35:17 UTC -+++ gcc/config.gcc -@@ -2868,6 +2868,10 @@ powerpc*-*-freebsd*) - extra_options="${extra_options} rs6000/sysv4.opt" - tmake_file="rs6000/t-fprules rs6000/t-ppcos ${tmake_file} rs6000/t-ppccomm" - case ${target} in -+ powerpc*le-*-*) -+ tm_file="${tm_file} rs6000/sysv4le.h" ;; -+ esac -+ case ${target} in - powerpc64*) - tm_file="${tm_file} rs6000/default64.h rs6000/freebsd64.h" - tmake_file="${tmake_file} rs6000/t-freebsd64" ---- gcc/config/rs6000/freebsd64.h.orig 2020-07-23 06:35:17 UTC -+++ gcc/config/rs6000/freebsd64.h -@@ -51,11 +51,10 @@ extern int dot_symbols; - #define SET_CMODEL(opt) do {} while (0) - #endif - --/* Until now the 970 is the only Processor where FreeBSD 64-bit runs on. */ - #undef PROCESSOR_DEFAULT --#define PROCESSOR_DEFAULT PROCESSOR_POWER4 -+#define PROCESSOR_DEFAULT PROCESSOR_PPC7450 - #undef PROCESSOR_DEFAULT64 --#define PROCESSOR_DEFAULT64 PROCESSOR_POWER4 -+#define PROCESSOR_DEFAULT64 PROCESSOR_POWER8 - - /* We don't need to generate entries in .fixup, except when - -mrelocatable or -mrelocatable-lib is given. */ -@@ -158,8 +157,8 @@ extern int dot_symbols; - #define ASM_SPEC64 "-a64" - - #define ASM_SPEC_COMMON "%(asm_cpu) \ --%{,assembler|,assembler-with-cpp: %{mregnames} %{mno-regnames}} \ --%{mlittle} %{mlittle-endian} %{mbig} %{mbig-endian}" -+%{,assembler|,assembler-with-cpp: %{mregnames} %{mno-regnames}}" \ -+ ENDIAN_SELECT(" -mbig", " -mlittle", DEFAULT_ASM_ENDIAN) - - #undef SUBSUBTARGET_EXTRA_SPECS - #define SUBSUBTARGET_EXTRA_SPECS \ -@@ -181,9 +180,15 @@ extern int dot_symbols; - %{static:-Bstatic}} \ - %{symbolic:-Bsymbolic}" - -+#undef DEFAULT_ASM_ENDIAN - #define LINK_OS_FREEBSD_SPEC32 "-melf32ppc_fbsd " LINK_OS_FREEBSD_SPEC_DEF -- -+#if (TARGET_DEFAULT & MASK_LITTLE_ENDIAN) -+#define DEFAULT_ASM_ENDIAN " -mlittle" -+#define LINK_OS_FREEBSD_SPEC64 "-melf64lppc_fbsd " LINK_OS_FREEBSD_SPEC_DEF -+#else -+#define DEFAULT_ASM_ENDIAN " -mbig" - #define LINK_OS_FREEBSD_SPEC64 "-melf64ppc_fbsd " LINK_OS_FREEBSD_SPEC_DEF -+#endif - - #undef MULTILIB_DEFAULTS - #define MULTILIB_DEFAULTS { "m64" } ---- gcc/configure.orig 2020-07-23 06:35:17 UTC -+++ gcc/configure -@@ -29398,13 +29398,16 @@ $as_echo "#define HAVE_LD_PPC_GNU_ATTR_LONG_DOUBLE 1" - esac - - case "$target:$tm_file" in -- powerpc64-*-freebsd* | powerpc64*-*-linux* | powerpc*-*-linux*rs6000/biarch64.h*) -+ powerpc64*-*-freebsd* | powerpc64*-*-linux* | powerpc*-*-linux*rs6000/biarch64.h*) - case "$target" in - *le-*-linux*) - emul_name="-melf64lppc" - ;; - *-*-linux*) - emul_name="-melf64ppc" -+ ;; -+ *le-*-freebsd*) -+ emul_name="-melf64lppc_fbsd" - ;; - *-*-freebsd*) - emul_name="-melf64ppc_fbsd"