diff --git a/lang/gcc11-devel/Makefile b/lang/gcc11-devel/Makefile index cde3eccb4a71..cc7612307799 100644 --- a/lang/gcc11-devel/Makefile +++ b/lang/gcc11-devel/Makefile @@ -1,173 +1,173 @@ PORTNAME= gcc PORTVERSION= 11.3.1.s20221118 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= lang MASTER_SITES= GCC/snapshots/${DIST_VERSION} PKGNAMESUFFIX= ${SUFFIX}-devel DISTNAME= gcc-${DIST_VERSION} MAINTAINER= salvadore@FreeBSD.org COMMENT= GNU Compiler Collection 11 WWW= https://gcc.gnu.org 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:c++11-lang cpe gmake iconv libtool makeinfo perl5 tar:xz USE_BINUTILS= yes USE_PERL5= build CONFLICTS= gcc11 CPE_VENDOR= gnu CPE_VERSION= ${GCC_VERSION} # DIST_VERSION relates to downloads, GCC_VERSION and SUFFIX to names # of executables and directories once installed. A PORTVERSION of # Y.2.1.s20140817 results in values of Y-20140817, Y.2.1, and Y # for these three. 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/} CFLAGS:= ${CFLAGS:N-mretpoline} CXXFLAGS:= ${CXXFLAGS:N-mretpoline} OPTIONS_DEFINE= GRAPHITE OPTIONS_DEFAULT_aarch64=LTO_BOOTSTRAP OPTIONS_DEFAULT_amd64= LTO_BOOTSTRAP OPTIONS_DEFAULT_i386= LTO_BOOTSTRAP OPTIONS_DEFAULT_powerpc=LTO_BOOTSTRAP OPTIONS_DEFAULT_powerpc64=LTO_BOOTSTRAP OPTIONS_DEFAULT_powerpc64le=LTO_BOOTSTRAP OPTIONS_RADIO= BOOTSTRAP OPTIONS_RADIO_BOOTSTRAP= LTO_BOOTSTRAP STANDARD_BOOTSTRAP LTO_BOOTSTRAP_DESC= Build using a full LTO bootstrap STANDARD_BOOTSTRAP_DESC= Build using a full bootstrap without LTO 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 # https://gcc.gnu.org/bugzilla/show_bug.cgi?id=105010 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 defined(PPC_ABI) && ${PPC_ABI} == ELFv2 CONFIGURE_ARGS+= --with-abi=elfv2 .endif LANGUAGES:= c,c++,d,objc,fortran,jit 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:M*BOOTSTRAP) CONFIGURE_ARGS+=--disable-bootstrap .elif ${PORT_OPTIONS:MLTO_BOOTSTRAP} CONFIGURE_ARGS+=--with-build-config=bootstrap-lto-noplugin ALL_TARGET= bootstrap-lean .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-host-shared \ --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-gxx-libcxx-include-dir=/usr/include/c++/v1 \ --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}/gdc \ gcc${SUFFIX}/gfortran \ gcc${SUFFIX}/libgccjit \ gcc${SUFFIX}/libgomp .if ${ARCH} == amd64 || ${ARCH} == i386 INFO+= gcc${SUFFIX}/libquadmath \ gcc${SUFFIX}/libitm .endif 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/gcc11-devel/files/patch-libsanitizer_sanitizer__common_sanitizer__linux.cpp b/lang/gcc11-devel/files/patch-libsanitizer_sanitizer__common_sanitizer__linux.cpp new file mode 100644 index 000000000000..bf9b0df79e0b --- /dev/null +++ b/lang/gcc11-devel/files/patch-libsanitizer_sanitizer__common_sanitizer__linux.cpp @@ -0,0 +1,61 @@ +Patch taken from the following commits: + +- https://cgit.freebsd.org/src/commit/?id=7cafe89f9ce33effe6e471b185339d413da1ca46 +- https://cgit.freebsd.org/src/commit/?id=930a7c2ac67e1e8e511aa1d0a31a16c632060ebb + +--- libsanitizer/sanitizer_common/sanitizer_linux.cpp.orig 2022-11-26 10:40:30 UTC ++++ libsanitizer/sanitizer_common/sanitizer_linux.cpp +@@ -80,6 +80,7 @@ + + #if SANITIZER_FREEBSD + #include ++#include + #include + #include + extern "C" { +@@ -2171,33 +2172,20 @@ void CheckASLR() { + ReExec(); + } + #elif SANITIZER_FREEBSD +- int aslr_pie; +- uptr len = sizeof(aslr_pie); +-#if SANITIZER_WORDSIZE == 64 +- if (UNLIKELY(internal_sysctlbyname("kern.elf64.aslr.pie_enable", +- &aslr_pie, &len, NULL, 0) == -1)) { +- // We're making things less 'dramatic' here since +- // the OID is not necessarily guaranteed to be here ++ int aslr_status; ++ if (UNLIKELY(procctl(P_PID, 0, PROC_ASLR_STATUS, &aslr_status) == -1)) { ++ // We're making things less 'dramatic' here since ++ // the cmd is not necessarily guaranteed to be here + // just yet regarding FreeBSD release + return; +- } +- +- if (aslr_pie > 0) { +- Printf("This sanitizer is not compatible with enabled ASLR " +- "and binaries compiled with PIE\n"); +- Die(); +- } +-#endif +- // there might be 32 bits compat for 64 bits +- if (UNLIKELY(internal_sysctlbyname("kern.elf32.aslr.pie_enable", +- &aslr_pie, &len, NULL, 0) == -1)) { +- return; +- } +- +- if (aslr_pie > 0) { +- Printf("This sanitizer is not compatible with enabled ASLR " +- "and binaries compiled with PIE\n"); +- Die(); ++ } ++ if ((aslr_status & PROC_ASLR_ACTIVE) != 0) { ++ VReport(1, "This sanitizer is not compatible with enabled ASLR " ++ "and binaries compiled with PIE\n" ++ "ASLR will be disabled and the program re-executed.\n"); ++ int aslr_ctl = PROC_ASLR_FORCE_DISABLE; ++ CHECK_NE(procctl(P_PID, 0, PROC_ASLR_CTL, &aslr_ctl), -1); ++ ReExec(); + } + #else + // Do nothing diff --git a/lang/gcc11-devel/files/patch-libsanitizer_sanitizer__common_sanitizer__linux__libcdep.cpp b/lang/gcc11-devel/files/patch-libsanitizer_sanitizer__common_sanitizer__linux__libcdep.cpp new file mode 100644 index 000000000000..7f13f8591313 --- /dev/null +++ b/lang/gcc11-devel/files/patch-libsanitizer_sanitizer__common_sanitizer__linux__libcdep.cpp @@ -0,0 +1,32 @@ +Patch taken from + +https://cgit.freebsd.org/src/commit/?id=96fe7c8ab0f65cf829619abd74ae6c126b21e15f + +--- libsanitizer/sanitizer_common/sanitizer_linux_libcdep.cpp.orig 2022-11-26 09:47:34 UTC ++++ libsanitizer/sanitizer_common/sanitizer_linux_libcdep.cpp +@@ -45,7 +45,9 @@ + + #if SANITIZER_FREEBSD + #include ++#include + #include ++#include + #include + #define pthread_getattr_np pthread_attr_get_np + #endif +@@ -857,7 +859,14 @@ void ReExec() { + void ReExec() { + const char *pathname = "/proc/self/exe"; + +-#if SANITIZER_NETBSD ++#if SANITIZER_FREEBSD ++ char exe_path[PATH_MAX]; ++ if (elf_aux_info(AT_EXECPATH, exe_path, sizeof(exe_path)) == 0) { ++ char link_path[PATH_MAX]; ++ if (realpath(exe_path, link_path)) ++ pathname = link_path; ++ } ++#elif SANITIZER_NETBSD + static const int name[] = { + CTL_KERN, + KERN_PROC_ARGS,