2 files changed, 23 insertions, 15 deletions
diff --git a/lang/gcc16-devel/files/patch-libgcc_enable-execute-stack-mprotect.c b/lang/gcc16-devel/files/patch-libgcc_enable-execute-stack-mprotect.c
deleted file mode 100644
index 4645f084fef0..000000000000
--- a/lang/gcc16-devel/files/patch-libgcc_enable-execute-stack-mprotect.c
+++ /dev/null
@@ -1,15 +0,0 @@
---- libgcc/enable-execute-stack-mprotect.c.orig	2024-11-23 12:39:04 UTC
-+++ libgcc/enable-execute-stack-mprotect.c
-@@ -30,10 +30,11 @@ static int need_enable_exec_stack;
- 
- static int need_enable_exec_stack;
- 
--static void check_enabling (void) __attribute__ ((unused));
- extern void __enable_execute_stack (void *);
- 
- #if defined __sun__ && defined __svr4__
-+static void check_enabling (void) __attribute__ ((unused));
-+
- static void __attribute__ ((constructor))
- check_enabling (void)
- {
diff --git a/lang/gcc16-devel/files/patch-libgcc_unwind-dw2-fde-dip.c b/lang/gcc16-devel/files/patch-libgcc_unwind-dw2-fde-dip.c
new file mode 100644
index 000000000000..66452b37de0f
--- /dev/null
+++ b/lang/gcc16-devel/files/patch-libgcc_unwind-dw2-fde-dip.c
@@ -0,0 +1,23 @@
+FreeBSD defines ElfW(x) to translate Linux's convention to FreeBSD's convention.
+GCC defines ElfW to convert its convention to FreeBSD's convention. This patch
+removes the conversion defined by GCC so that the FreeBSD conversion only is
+applied.
+
+--- libgcc/unwind-dw2-fde-dip.c.orig	2025-05-16 15:47:38 UTC
++++ libgcc/unwind-dw2-fde-dip.c
+@@ -59,13 +59,13 @@
+ 
+ #if !defined(inhibit_libc) && defined(HAVE_LD_EH_FRAME_HDR) \
+     && defined(TARGET_DL_ITERATE_PHDR) \
+-    && defined(__linux__)
++    && (defined(__linux__) || defined(__FreeBSD__))
+ # define USE_PT_GNU_EH_FRAME
+ #endif
+ 
+ #if !defined(inhibit_libc) && defined(HAVE_LD_EH_FRAME_HDR) \
+     && defined(TARGET_DL_ITERATE_PHDR) \
+-    && (defined(__DragonFly__) || defined(__FreeBSD__))
++    && defined(__DragonFly__)
+ # define ElfW __ElfN
+ # define USE_PT_GNU_EH_FRAME
+ #endif