3 files changed, 27 insertions, 4 deletions
diff --git a/lang/gcc15-devel/Makefile b/lang/gcc15-devel/Makefile
index 4eed868d47df..89c06b1e2135 100644
--- a/lang/gcc15-devel/Makefile
+++ b/lang/gcc15-devel/Makefile
@@ -1,5 +1,5 @@
 PORTNAME=	gcc
-PORTVERSION=	15.1.1.s20250426
+PORTVERSION=	15.1.1.s20250517
 CATEGORIES=	lang
 MASTER_SITES=	GCC/snapshots/${DIST_VERSION}
 PKGNAMESUFFIX=	${SUFFIX}-devel
diff --git a/lang/gcc15-devel/distinfo b/lang/gcc15-devel/distinfo
index c25e126fa010..bad8319d50de 100644
--- a/lang/gcc15-devel/distinfo
+++ b/lang/gcc15-devel/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1745914552
-SHA256 (gcc-15-20250426.tar.xz) = 5da29d2cff64251a61fbcc62bf6245710f05d2ccf8f49c8138142da700b699e7
-SIZE (gcc-15-20250426.tar.xz) = 92081764
+TIMESTAMP = 1747727595
+SHA256 (gcc-15-20250517.tar.xz) = 774a2f1a0c4e4741daa719a1d1b0ff49ace3df1c9c597146a15b2767d33a143f
+SIZE (gcc-15-20250517.tar.xz) = 92058284
diff --git a/lang/gcc15-devel/files/patch-libgcc_unwind-dw2-fde-dip.c b/lang/gcc15-devel/files/patch-libgcc_unwind-dw2-fde-dip.c
new file mode 100644
index 000000000000..66452b37de0f
--- /dev/null
+++ b/lang/gcc15-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