3 files changed, 27 insertions, 4 deletions
diff --git a/lang/gcc16-devel/Makefile b/lang/gcc16-devel/Makefile
index a57e6b356b3e..1a1e9b016fec 100644
--- a/lang/gcc16-devel/Makefile
+++ b/lang/gcc16-devel/Makefile
@@ -1,5 +1,5 @@
 PORTNAME=	gcc
-PORTVERSION=	16.0.0.s20250511
+PORTVERSION=	16.0.0.s20250518
 CATEGORIES=	lang
 MASTER_SITES=	GCC/snapshots/${DIST_VERSION}
 PKGNAMESUFFIX=	${SUFFIX}-devel
diff --git a/lang/gcc16-devel/distinfo b/lang/gcc16-devel/distinfo
index 891629dc8103..337e8de49d1d 100644
--- a/lang/gcc16-devel/distinfo
+++ b/lang/gcc16-devel/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1747125019
-SHA256 (gcc-16-20250511.tar.xz) = 4086bd9369a82d087d1bd60e2fdd926ee0401115a52542d962c085bf99f41a24
-SIZE (gcc-16-20250511.tar.xz) = 92224236
+TIMESTAMP = 1747727840
+SHA256 (gcc-16-20250518.tar.xz) = 2e50491fa1bd3543c2c02a57eba0296fadc00063622ea94e7c8383edf7420b0f
+SIZE (gcc-16-20250518.tar.xz) = 92257212
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