aboutsummaryrefslogtreecommitdiff
path: root/lang/gcc11/files
diff options
context:
space:
mode:
Diffstat (limited to 'lang/gcc11/files')
-rw-r--r--lang/gcc11/files/patch-arm-unwind-cxx-support106
-rw-r--r--lang/gcc11/files/patch-clang-vec_step21
-rw-r--r--lang/gcc11/files/patch-gcc_Makefile.in19
-rw-r--r--lang/gcc11/files/patch-gcc_configure22
-rw-r--r--lang/gcc11/files/patch-gcc_jit_Make-lang.in14
-rw-r--r--lang/gcc11/files/patch-gets-no-more47
-rw-r--r--lang/gcc11/files/patch-gfortran-libgcc70
-rw-r--r--lang/gcc11/files/patch-libcxxrt18
-rw-r--r--lang/gcc11/files/patch-libphobos_libdruntime_core_sys_freebsd_config.d15
-rw-r--r--lang/gcc11/files/patch-libsanitizer_asan_asan__linux.cpp18
-rw-r--r--lang/gcc11/files/patch-libsanitizer_sanitizer__common_sanitizer__linux.cpp61
-rw-r--r--lang/gcc11/files/patch-libsanitizer_sanitizer__common_sanitizer__linux__libcdep.cpp32
-rw-r--r--lang/gcc11/files/pkg-message.in13
13 files changed, 0 insertions, 456 deletions
diff --git a/lang/gcc11/files/patch-arm-unwind-cxx-support b/lang/gcc11/files/patch-arm-unwind-cxx-support
deleted file mode 100644
index ec6959b9655c..000000000000
--- a/lang/gcc11/files/patch-arm-unwind-cxx-support
+++ /dev/null
@@ -1,106 +0,0 @@
---- UTC
-Index: gcc/ginclude/unwind-arm-common.h
-===================================================================
---- gcc/ginclude/unwind-arm-common.h (revision 219113)
-+++ gcc/ginclude/unwind-arm-common.h (working copy)
-@@ -82,7 +82,11 @@
-
- struct _Unwind_Control_Block
- {
-+#ifdef __FreeBSD__
-+ unsigned exception_class __attribute__((__mode__(__DI__)));
-+#else
- char exception_class[8];
-+#endif
- void (*exception_cleanup)(_Unwind_Reason_Code, _Unwind_Control_Block *);
- /* Unwinder cache, private fields for the unwinder's use */
- struct
-@@ -181,7 +185,11 @@
-
- /* Support functions for the PR. */
- #define _Unwind_Exception _Unwind_Control_Block
-+#ifdef __FreeBSD__
-+ typedef unsigned _Unwind_Exception_Class __attribute__((__mode__(__DI__)));
-+#else
- typedef char _Unwind_Exception_Class[8];
-+#endif
-
- void * _Unwind_GetLanguageSpecificData (_Unwind_Context *);
- _Unwind_Ptr _Unwind_GetRegionStart (_Unwind_Context *);
-Index: libstdc++-v3/libsupc++/unwind-cxx.h
-===================================================================
---- libstdc++-v3/libsupc++/unwind-cxx.h (revision 219147)
-+++ libstdc++-v3/libsupc++/unwind-cxx.h (working copy)
-@@ -235,7 +235,7 @@
- return reinterpret_cast<__cxa_dependent_exception *>(exc + 1) - 1;
- }
-
--#ifdef __ARM_EABI_UNWINDER__
-+#if defined(__ARM_EABI_UNWINDER__) && !defined(__FreeBSD__)
- static inline bool
- __is_gxx_exception_class(_Unwind_Exception_Class c)
- {
-@@ -309,13 +309,7 @@
- c[6] = 'R';
- c[7] = '\0';
- }
--
--static inline void*
--__gxx_caught_object(_Unwind_Exception* eo)
--{
-- return (void*)eo->barrier_cache.bitpattern[0];
--}
--#else // !__ARM_EABI_UNWINDER__
-+#else // !__ARM_EABI_UNWINDER__ || __FreeBSD__
- // This is the primary exception class we report -- "GNUCC++\0".
- const _Unwind_Exception_Class __gxx_primary_exception_class
- = ((((((((_Unwind_Exception_Class) 'G'
-@@ -339,6 +333,16 @@
- << 8 | (_Unwind_Exception_Class) '+')
- << 8 | (_Unwind_Exception_Class) '\x01');
-
-+const _Unwind_Exception_Class __gxx_forced_unwind_class
-+= ((((((((_Unwind_Exception_Class) 'G'
-+ << 8 | (_Unwind_Exception_Class) 'N')
-+ << 8 | (_Unwind_Exception_Class) 'U')
-+ << 8 | (_Unwind_Exception_Class) 'C')
-+ << 8 | (_Unwind_Exception_Class) 'F')
-+ << 8 | (_Unwind_Exception_Class) 'O')
-+ << 8 | (_Unwind_Exception_Class) 'R')
-+ << 8 | (_Unwind_Exception_Class) '\0');
-+
- static inline bool
- __is_gxx_exception_class(_Unwind_Exception_Class c)
- {
-@@ -346,6 +350,12 @@
- || c == __gxx_dependent_exception_class;
- }
-
-+static inline bool
-+__is_gxx_forced_unwind_class(_Unwind_Exception_Class c)
-+{
-+ return c == __gxx_forced_unwind_class;
-+}
-+
- // Only checks for primary or dependent, but not that it is a C++ exception at
- // all.
- static inline bool
-@@ -357,7 +367,18 @@
- #define __GXX_INIT_PRIMARY_EXCEPTION_CLASS(c) c = __gxx_primary_exception_class
- #define __GXX_INIT_DEPENDENT_EXCEPTION_CLASS(c) \
- c = __gxx_dependent_exception_class
-+#define __GXX_INIT_FORCED_UNWIND_CLASS(c) c = __gxx_forced_unwind_class
-+#endif // __ARM_EABI_UNWINDER__ && !__FreeBSD__
-
-+#ifdef __ARM_EABI_UNWINDER__
-+static inline void*
-+__gxx_caught_object(_Unwind_Exception* eo)
-+{
-+ return (void*)eo->barrier_cache.bitpattern[0];
-+}
-+
-+#else // !__ARM_EABI_UNWINDER__
-+
- // GNU C++ personality routine, Version 0.
- extern "C" _Unwind_Reason_Code __gxx_personality_v0
- (int, _Unwind_Action, _Unwind_Exception_Class,
diff --git a/lang/gcc11/files/patch-clang-vec_step b/lang/gcc11/files/patch-clang-vec_step
deleted file mode 100644
index 68fbeedad582..000000000000
--- a/lang/gcc11/files/patch-clang-vec_step
+++ /dev/null
@@ -1,21 +0,0 @@
-https://bugs.freebsd.org/bugzilla/show_bug.cgi?id=239266 reports how
-clang unfortunately poisons user namespace by default (without any
-special options).
-
-Until that changes (or GCC changes) we need to avoid using vec_step
-as a variable.
-
---- UTC
-Index: gcc/tree-vect-loop.c
-===================================================================
---- gcc/tree-vect-loop.c (revision 273856)
-+++ gcc/tree-vect-loop.c (working copy)
-@@ -55,6 +55,8 @@ along with GCC; see the file COPYING3. If not see
- #include "vec-perm-indices.h"
- #include "tree-eh.h"
-
-+#define vec_step vec_step_
-+
- /* Loop Vectorization Pass.
-
- This pass tries to vectorize loops.
diff --git a/lang/gcc11/files/patch-gcc_Makefile.in b/lang/gcc11/files/patch-gcc_Makefile.in
deleted file mode 100644
index 4d25cf85abc7..000000000000
--- a/lang/gcc11/files/patch-gcc_Makefile.in
+++ /dev/null
@@ -1,19 +0,0 @@
---- gcc/Makefile.in.orig 2022-11-02 20:13:34 UTC
-+++ gcc/Makefile.in
-@@ -630,6 +630,8 @@ libsubdir = $(libdir)/gcc/$(real_target_noncanonical)/
-
- # Directory in which the compiler finds libraries etc.
- libsubdir = $(libdir)/gcc/$(real_target_noncanonical)/$(version)$(accel_dir_suffix)
-+# Directory in which the compiler finds headers.
-+libsubincludedir = $(libdir)/gcc/$(target_alias)/$(version)/include
- # Directory in which the compiler finds executables
- libexecsubdir = $(libexecdir)/gcc/$(real_target_noncanonical)/$(version)$(accel_dir_suffix)
- # Directory in which all plugin resources are installed
-@@ -3609,6 +3611,7 @@ installdirs:
- # $(libdir)/gcc/include isn't currently searched by cpp.
- installdirs:
- $(mkinstalldirs) $(DESTDIR)$(libsubdir)
-+ $(mkinstalldirs) $(DESTDIR)$(libsubincludedir)
- $(mkinstalldirs) $(DESTDIR)$(libexecsubdir)
- $(mkinstalldirs) $(DESTDIR)$(bindir)
- $(mkinstalldirs) $(DESTDIR)$(includedir)
diff --git a/lang/gcc11/files/patch-gcc_configure b/lang/gcc11/files/patch-gcc_configure
deleted file mode 100644
index cc60593ba6f7..000000000000
--- a/lang/gcc11/files/patch-gcc_configure
+++ /dev/null
@@ -1,22 +0,0 @@
-Enable support for .init_array and .fini_array, which FreeBSD supports
-since commit 83aa9cc00c2d83d05a0efe7a1496d8aab4a153bb in the src
-repository.
-
-There __FreeBSD_version is 1000009, so we start enabling the support
-from __FreeBSD_version == 1000010.
---- gcc/configure.orig 2023-05-11 22:33:34 UTC
-+++ gcc/configure
-@@ -24214,6 +24214,13 @@ EOF
- #else
- # if defined __sun__ && defined __svr4__
- /* Solaris ld.so.1 supports .init_array/.fini_array since Solaris 8. */
-+# elif defined __FreeBSD__
-+# include <sys/param.h>
-+# if __FreeBSD_version >= 1000010
-+ /* FreeBSD supports .init_array/.fini_array since FreeBSD 10. */
-+# else
-+# error The C library not known to support .init_array/.fini_array
-+# endif
- # else
- # error The C library not known to support .init_array/.fini_array
- # endif
diff --git a/lang/gcc11/files/patch-gcc_jit_Make-lang.in b/lang/gcc11/files/patch-gcc_jit_Make-lang.in
deleted file mode 100644
index 85728a1cb0d0..000000000000
--- a/lang/gcc11/files/patch-gcc_jit_Make-lang.in
+++ /dev/null
@@ -1,14 +0,0 @@
---- gcc/jit/Make-lang.in.orig 2022-11-02 17:25:43 UTC
-+++ gcc/jit/Make-lang.in
-@@ -355,9 +355,9 @@ jit.install-headers: installdirs
- # Install hooks:
- jit.install-headers: installdirs
- $(INSTALL_DATA) $(srcdir)/jit/libgccjit.h \
-- $(DESTDIR)$(includedir)/libgccjit.h
-+ $(DESTDIR)$(libsubincludedir)/libgccjit.h
- $(INSTALL_DATA) $(srcdir)/jit/libgccjit++.h \
-- $(DESTDIR)$(includedir)/libgccjit++.h
-+ $(DESTDIR)$(libsubincludedir)/libgccjit++.h
-
- ifneq (,$(findstring mingw,$(target)))
- jit.install-common: installdirs jit.install-headers
diff --git a/lang/gcc11/files/patch-gets-no-more b/lang/gcc11/files/patch-gets-no-more
deleted file mode 100644
index 4b49aba3ca28..000000000000
--- a/lang/gcc11/files/patch-gets-no-more
+++ /dev/null
@@ -1,47 +0,0 @@
-Disable the build/use of libssp/gets-chk since FreeBSD 12 and later
-do not feature gets() any longer.
-
---- UTC
-Index: libssp/Makefile.am
-===================================================================
---- libssp/Makefile.am (revision 263319)
-+++ libssp/Makefile.am (working copy)
-@@ -42,7 +42,7 @@
- nobase_libsubinclude_HEADERS = ssp/ssp.h ssp/string.h ssp/stdio.h ssp/unistd.h
-
- libssp_la_SOURCES = \
-- ssp.c gets-chk.c memcpy-chk.c memmove-chk.c mempcpy-chk.c \
-+ ssp.c memcpy-chk.c memmove-chk.c mempcpy-chk.c \
- memset-chk.c snprintf-chk.c sprintf-chk.c stpcpy-chk.c \
- strcat-chk.c strcpy-chk.c strncat-chk.c strncpy-chk.c \
- vsnprintf-chk.c vsprintf-chk.c
-Index: libssp/Makefile.in
-===================================================================
---- libssp/Makefile.in (revision 263319)
-+++ libssp/Makefile.in (working copy)
-@@ -108,7 +108,7 @@
- am__installdirs = "$(DESTDIR)$(toolexeclibdir)" \
- "$(DESTDIR)$(libsubincludedir)"
- LTLIBRARIES = $(toolexeclib_LTLIBRARIES)
--am_libssp_la_OBJECTS = ssp.lo gets-chk.lo memcpy-chk.lo memmove-chk.lo \
-+am_libssp_la_OBJECTS = ssp.lo memcpy-chk.lo memmove-chk.lo \
- mempcpy-chk.lo memset-chk.lo snprintf-chk.lo sprintf-chk.lo \
- stpcpy-chk.lo strcat-chk.lo strcpy-chk.lo strncat-chk.lo \
- strncpy-chk.lo vsnprintf-chk.lo vsprintf-chk.lo
-@@ -291,7 +291,7 @@
- libsubincludedir = $(libdir)/gcc/$(target_noncanonical)/$(gcc_version)/include
- nobase_libsubinclude_HEADERS = ssp/ssp.h ssp/string.h ssp/stdio.h ssp/unistd.h
- libssp_la_SOURCES = \
-- ssp.c gets-chk.c memcpy-chk.c memmove-chk.c mempcpy-chk.c \
-+ ssp.c memcpy-chk.c memmove-chk.c mempcpy-chk.c \
- memset-chk.c snprintf-chk.c sprintf-chk.c stpcpy-chk.c \
- strcat-chk.c strcpy-chk.c strncat-chk.c strncpy-chk.c \
- vsnprintf-chk.c vsprintf-chk.c
-@@ -452,7 +452,6 @@
- distclean-compile:
- -rm -f *.tab.c
-
--@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/gets-chk.Plo@am__quote@
- @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libssp_nonshared_la-ssp-local.Plo@am__quote@
- @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/memcpy-chk.Plo@am__quote@
- @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/memmove-chk.Plo@am__quote@
diff --git a/lang/gcc11/files/patch-gfortran-libgcc b/lang/gcc11/files/patch-gfortran-libgcc
deleted file mode 100644
index 89c6cb902c42..000000000000
--- a/lang/gcc11/files/patch-gfortran-libgcc
+++ /dev/null
@@ -1,70 +0,0 @@
-GCC has two runtime libraries: The static library libgcc.a (-lgcc) and
-the shared library libgcc_s.so (-lgcc_s). Both implement many of the
-same functions but they also each have their unique functions. When
-gcc links programs and libraries there are three possibilities:
-
-1. gcc -static-libgcc or gcc -static: -lgcc
- => Just use libgcc.a.
-
-2. gcc -shared-libgcc: -lgcc_s -lgcc
- => Link with libgcc_s first, so libgcc.a is only used for its unique
- functions.
-
-3. gcc: -lgcc -Wl,--as-needed -lgcc_s -Wl,--no-as-needed
- => Link with libgcc.a first so libgcc_s is only used for its unique
- functions (_Unwind_* functions).
-
-Approach 3 is the default for gcc and it's also what clang and clang++ use;
-approach 2 is the default for gfortran, g++ and probably other front ends.
-
-This patch makes 3 the default for gfortran. It significantly reduces
-the use of libgcc_s. The _Unwind_* functions are also available in the
-old base system libgcc_s which means this reduces the need for
--rpath /usr/local/lib/gccN in ports that depend on libraries built with
-gfortran. Consider a dependency tree like this:
-
- prog -> libA -> libgcc_s (old base system libgcc_s is fine)
- -> libB -> libgcc_s (libB built with gfortran, needs new libgcc_s)
-
-Here prog needs to be linked with -rpath /usr/local/lib/gccN even if it's
-a normal C program compiled with clang. Without -rpath it will fail to
-start because it loads old libgcc_s first as a dependency of libA and then
-it fails to load libB. With this patch libB works with old base system
-libgcc_s or may not need libgcc_s at all, so prog does not need to be
-linked with -rpath.
-
-Upstream is unlikely accept a patch like this because libgfortran calls
-some _Unwind_* functions and so always needs libgcc_s. Also because
-every Fortran program and library links to libgfortran it makes sense
-that option 2 above is the default. On FreeBSD where clang and GCC
-compiled code can be mixed and where multiple libgcc_s may be installed,
-option 3 is just a lot easier to deal with.
-
-The bug that sparked this is PR 208120 (but note there's a lot of
-misleading information in that bug. CMake is not actually doing
-anything wrong.)
-
---- UTC
---- gcc/fortran/gfortranspec.c.orig 2015-06-26 17:47:23 UTC
-+++ gcc/fortran/gfortranspec.c
-@@ -404,7 +404,7 @@ For more information about these matters
- }
- }
-
--#ifdef ENABLE_SHARED_LIBGCC
-+#if 0
- if (library)
- {
- unsigned int i;
-
---- libgfortran/Makefile.in.orig 2019-02-22 14:22:13.000000000 +0000
-+++ libgfortran/Makefile.in 2019-02-27 16:27:08.856408000 +0000
-@@ -625,7 +625,7 @@
- $(LTLDFLAGS) $(LIBQUADLIB) ../libbacktrace/libbacktrace.la \
- $(HWCAP_LDFLAGS) \
- -lm $(extra_ldflags_libgfortran) \
-- $(version_arg) -Wc,-shared-libgcc
-+ $(version_arg)
-
- libgfortran_la_DEPENDENCIES = $(version_dep) libgfortran.spec $(LIBQUADLIB_DEP)
- cafexeclib_LTLIBRARIES = libcaf_single.la
diff --git a/lang/gcc11/files/patch-libcxxrt b/lang/gcc11/files/patch-libcxxrt
deleted file mode 100644
index 4e8a5c34305f..000000000000
--- a/lang/gcc11/files/patch-libcxxrt
+++ /dev/null
@@ -1,18 +0,0 @@
-libc++ on FreeBSD always uses PathScale libcxxrt and cannot change to
-LLVM libc++abi without breaking backward compatibility. Besides, mixing
-different C++ ABIs is not supported unless subset via DT_FILTER.
-
-https://github.com/llvm/llvm-project/commit/35479ffb1251
-https://github.com/freebsd/freebsd-src/commit/cf56074e5271
-
---- gcc/cp/g++spec.c.orig 2022-04-21 07:58:53 UTC
-+++ gcc/cp/g++spec.c
-@@ -60,7 +60,7 @@ along with GCC; see the file COPYING3. If not see
- #endif
-
- #ifndef LIBCXXABI
--#define LIBCXXABI "c++abi"
-+#define LIBCXXABI "cxxrt"
- #endif
- #ifndef LIBCXXABI_PROFILE
- #define LIBCXXABI_PROFILE LIBCXXABI
diff --git a/lang/gcc11/files/patch-libphobos_libdruntime_core_sys_freebsd_config.d b/lang/gcc11/files/patch-libphobos_libdruntime_core_sys_freebsd_config.d
deleted file mode 100644
index f6b5affb5db0..000000000000
--- a/lang/gcc11/files/patch-libphobos_libdruntime_core_sys_freebsd_config.d
+++ /dev/null
@@ -1,15 +0,0 @@
---- libphobos/libdruntime/core/sys/freebsd/config.d.orig 2023-08-31 22:33:21 UTC
-+++ libphobos/libdruntime/core/sys/freebsd/config.d
-@@ -13,8 +13,10 @@ public import core.sys.posix.config;
- // __FreeBSD_version numbers are documented in the Porter's Handbook.
- // NOTE: When adding newer versions of FreeBSD, verify all current versioned
- // bindings are still compatible with the release.
-- version (FreeBSD_13) enum __FreeBSD_version = 1300000;
--else version (FreeBSD_12) enum __FreeBSD_version = 1202000;
-+ version (FreeBSD_15) enum __FreeBSD_version = 1500000;
-+else version (FreeBSD_14) enum __FreeBSD_version = 1401000;
-+else version (FreeBSD_13) enum __FreeBSD_version = 1303000;
-+else version (FreeBSD_12) enum __FreeBSD_version = 1204000;
- else version (FreeBSD_11) enum __FreeBSD_version = 1104000;
- else version (FreeBSD_10) enum __FreeBSD_version = 1004000;
- else version (FreeBSD_9) enum __FreeBSD_version = 903000;
diff --git a/lang/gcc11/files/patch-libsanitizer_asan_asan__linux.cpp b/lang/gcc11/files/patch-libsanitizer_asan_asan__linux.cpp
deleted file mode 100644
index 22630767b114..000000000000
--- a/lang/gcc11/files/patch-libsanitizer_asan_asan__linux.cpp
+++ /dev/null
@@ -1,18 +0,0 @@
-Since the vDSO shared librares on Linux and FreeBSD are called
-differently, the initialization order check fails on FreeBSD.
-This patch fixes it by ignoring [vdso] instead of linux-vdso.so.
-
-GCC gets the original file from the LLVM Project, so this patch should
-probably be upstreamed directly to the LLVM Project rather than to GCC.
-
---- libsanitizer/asan/asan_linux.cpp.orig 2022-11-23 10:52:45 UTC
-+++ libsanitizer/asan/asan_linux.cpp
-@@ -135,7 +135,7 @@ static int FindFirstDSOCallback(struct dl_phdr_info *i
- return 0;
-
- // Ignore vDSO
-- if (internal_strncmp(info->dlpi_name, "linux-", sizeof("linux-") - 1) == 0)
-+ if (internal_strncmp(info->dlpi_name, "[vdso]", sizeof("[vdso]") - 1) == 0)
- return 0;
-
- #if SANITIZER_FREEBSD || SANITIZER_NETBSD
diff --git a/lang/gcc11/files/patch-libsanitizer_sanitizer__common_sanitizer__linux.cpp b/lang/gcc11/files/patch-libsanitizer_sanitizer__common_sanitizer__linux.cpp
deleted file mode 100644
index bf9b0df79e0b..000000000000
--- a/lang/gcc11/files/patch-libsanitizer_sanitizer__common_sanitizer__linux.cpp
+++ /dev/null
@@ -1,61 +0,0 @@
-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 <sys/exec.h>
-+#include <sys/procctl.h>
- #include <sys/sysctl.h>
- #include <machine/atomic.h>
- 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/files/patch-libsanitizer_sanitizer__common_sanitizer__linux__libcdep.cpp b/lang/gcc11/files/patch-libsanitizer_sanitizer__common_sanitizer__linux__libcdep.cpp
deleted file mode 100644
index 7f13f8591313..000000000000
--- a/lang/gcc11/files/patch-libsanitizer_sanitizer__common_sanitizer__linux__libcdep.cpp
+++ /dev/null
@@ -1,32 +0,0 @@
-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 <pthread_np.h>
-+#include <stdlib.h>
- #include <osreldate.h>
-+#include <sys/auxv.h>
- #include <sys/sysctl.h>
- #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,
diff --git a/lang/gcc11/files/pkg-message.in b/lang/gcc11/files/pkg-message.in
deleted file mode 100644
index df3ea725ce59..000000000000
--- a/lang/gcc11/files/pkg-message.in
+++ /dev/null
@@ -1,13 +0,0 @@
-[
-{ type: install
- message: <<EOD
-To ensure binaries built with this toolchain find appropriate versions
-of the necessary run-time libraries, you may want to link using
-
- -Wl,-rpath=%%TARGLIB%%
-
-For ports leveraging USE_GCC, USES=compiler, or USES=fortran this happens
-transparently.
-EOD
-}
-]