Re: lang/gcc/15: enable dlang on amd64 and arm64

On Mon, 01 Dec 2025 03:03:05 +0100, Kirill A. Korinsky wrote:
> ports@,
>
> I'd like to enable gdc (dlang) on amd64 and arm64 inside lang/gcc/15.
>
> To do it I need to updaed boostrap to latest version of lang/gcc/11.
> I still called it as adastrap, but maybe we need to rename it.
>
> Here links to two used bootstraps:
> - https://kirill.korins.ky/pub/distfiles/adastrap-amd64-11.2.0-6.tar.xz
> - https://kirill.korins.ky/pub/distfiles/adastrap-aarch64-11.2.0-0.tar.xz

Mirrored. We'll probably rebuild the gcc15 version from gcc15 soon, but
until then ...

> I've attached two diffs:
> - gcc-11.diff is small one, just micro tune to build bootstrap
> - gcc-15.diff is a large one, where I recover gdc for amd64 and arm64
>
> both bootstrap builds from this week snapshots against libc.so.102.2
>
> Tested on the same snapshots on amd64 and arm64, compiles and exectued a
> trivial program:
>
> import std.stdio;
> import std.range;
> import std.algorithm;
> import std.concurrency;
> import core.thread;
>
> void fiberFunction()
> {
> 10.iota.each!(i => yield(i));
> }
>
> void threadFunction()
> {
> auto fiber = cast()receiveOnly!(shared(Generator!int));
> writefln("worker: %(%s %)", fiber.take(5));
> }
>
> void main()
> {
> auto numbers = new Generator!int(&fiberFunction);
> auto worker = spawn(&threadFunction);
>
> writefln("main : %(%s %)", numbers.take(2));
> worker.send(cast(shared)numbers);
> thread_joinAll();
>
> writefln("main : %(%s %)", numbers);
> }
>
> as
>
> main : 0 1
> worker: 2 3 4 5 6
> main : 7 8 9
>
> Anyone willing to test it? Or ok it?

OK.

> --
> wbr, Kirill
>
> Index: 11/Makefile
> ===================================================================
> RCS file: /cvs/ports/lang/gcc/11/Makefile,v
> diff -u -p -r1.58 Makefile
> --- 11/Makefile 28 Nov 2025 11:10:07 -0000 1.58
> +++ 11/Makefile 1 Dec 2025 01:56:51 -0000
> @@ -17,7 +17,9 @@ FULL_VERSION = $V
> FULL_PKGVERSION = $V
> REVISION = 21
>
> -ADASTRAP-amd64 = adastrap-amd64-$V-5.tar.xz
> +# aarch64 bootstrap contains only gdc
> +ADASTRAP-aarch64 = adastrap-aarch64-$V-0.tar.xz
> +ADASTRAP-amd64 = adastrap-amd64-$V-6.tar.xz
> ADASTRAP-i386 = adastrap-i386-$V-4.tar.xz
> ADASTRAP-mips64 = adastrap-mips64-8.4.0-5.tar.xz
> ADASTRAP-powerpc = adastrap-powerpc-$V-4.tar.xz
> @@ -272,14 +274,29 @@ post-install:
>
> ADA_PACKAGE = ${PACKAGE_REPOSITORY}/${MACHINE_ARCH}/all/${FULLPKGNAME-ada}.tgz
> GCC_PACKAGE = ${PACKAGE_REPOSITORY}/${MACHINE_ARCH}/all/${FULLPKGNAME-main}.tgz
> +GDC_PACKAGE = ${PACKAGE_REPOSITORY}/${MACHINE_ARCH}/all/${FULLPKGNAME-dlang}.tgz
> GXX_PACKAGE = ${PACKAGE_REPOSITORY}/${MACHINE_ARCH}/all/${FULLPKGNAME-c++}.tgz
>
> .PHONY: bootstrap
>
> +.if ${BUILD_PACKAGES:M-ada} && ${BUILD_PACKAGES:M-dlang}
> +bootstrap: ${ADA_PACKAGE} ${GCC_PACKAGE} ${GDC_PACKAGE} ${GXX_PACKAGE}
> +.elif ${BUILD_PACKAGES:M-ada}
> bootstrap: ${ADA_PACKAGE} ${GCC_PACKAGE} ${GXX_PACKAGE}
> +.elif ${BUILD_PACKAGES:M-dlang}
> +bootstrap: ${GCC_PACKAGE} ${GDC_PACKAGE} ${GXX_PACKAGE}
> +.else
> +bootstrap: ${GCC_PACKAGE} ${GXX_PACKAGE}
> +.endif
> + ${_PBUILD} rm -rf ${WRKDIR}/prepare
> ${_PBUILD} mkdir -p ${WRKDIR}/prepare/bootstrap/system-libs
> +.if ${BUILD_PACKAGES:M-ada}
> cd ${WRKDIR}/prepare/bootstrap && ${_PBUILD} tar xzf ${ADA_PACKAGE}
> +.endif
> cd ${WRKDIR}/prepare/bootstrap && ${_PBUILD} tar xzf ${GCC_PACKAGE}
> +.if ${BUILD_PACKAGES:M-dlang}
> + cd ${WRKDIR}/prepare/bootstrap && ${_PBUILD} tar xzf ${GDC_PACKAGE}
> +.endif
> cd ${WRKDIR}/prepare/bootstrap && ${_PBUILD} tar xzf ${GXX_PACKAGE}
> ${_PBUILD} rm -rf ${WRKDIR}/prepare/bootstrap/{+*,info,man,share}
> ${_PBUILD} rm -rf ${WRKDIR}/prepare/bootstrap/lib/gcc/*-openbsd*/$V/include-fixed
> Index: 11/distinfo
> ===================================================================
> RCS file: /cvs/ports/lang/gcc/11/distinfo,v
> diff -u -p -r1.15 distinfo
> --- 11/distinfo 20 Sep 2025 23:07:25 -0000 1.15
> +++ 11/distinfo 1 Dec 2025 01:56:51 -0000
> @@ -1,9 +1,9 @@
> -SHA256 (gcc/adastrap-amd64-11.2.0-5.tar.xz) = xv2mjPXOBPnrbP98RlbKmbNgE3iP8MHBrShaipe/YNI=
> +SHA256 (gcc/adastrap-amd64-11.2.0-6.tar.xz) = rxI866IO57k5nZGBVbaGynN0XRcA4QJIN1AAW3xNA1w=
> SHA256 (gcc/adastrap-i386-11.2.0-4.tar.xz) = 1T55LnFIsdo+lb3beM/FW0QR1U9RuHftAytxwRs8W/Y=
> SHA256 (gcc/adastrap-mips64-8.4.0-5.tar.xz) = Rfwenft0B3hxydQ3mqkkbFN40maQ73Jl4fgTFn1eNKQ=
> SHA256 (gcc/adastrap-powerpc-11.2.0-4.tar.xz) = 9KgiD7tqhcrCd8oTds/iVrmo9LXBNEAJQ+DdplytMuU=
> SHA256 (gcc/gcc-11.2.0.tar.xz) = 0I7cU2tUw3KhAQ/2YZ3SdMDxYDqkkhK6IPeqLNo2+os=
> -SIZE (gcc/adastrap-amd64-11.2.0-5.tar.xz) = 78100312
> +SIZE (gcc/adastrap-amd64-11.2.0-6.tar.xz) = 100826604
> SIZE (gcc/adastrap-i386-11.2.0-4.tar.xz) = 75923604
> SIZE (gcc/adastrap-mips64-8.4.0-5.tar.xz) = 49877060
> SIZE (gcc/adastrap-powerpc-11.2.0-4.tar.xz) = 70164724
>
> Index: 15/Makefile
> ===================================================================
> RCS file: /cvs/ports/lang/gcc/15/Makefile,v
> diff -u -p -r1.13 Makefile
> --- 15/Makefile 13 Nov 2025 23:30:14 -0000 1.13
> +++ 15/Makefile 1 Dec 2025 01:56:58 -0000
> @@ -5,6 +5,7 @@ ONLY_FOR_ARCHS = aarch64 alpha amd64 arm
> powerpc powerpc64 riscv64 sparc64
>
> ONLY_FOR_ARCHS-ada = amd64 mips64 powerpc # i386
> +ONLY_FOR_ARCHS-dlang = aarch64 amd64 # needs gdc from gcc-9+
>
> DPB_PROPERTIES = parallel
>
> @@ -18,9 +19,11 @@ V = 15.2.0
> FULL_VERSION = $V
> FULL_PKGVERSION = $V
>
> -REVISION = 3
> +REVISION = 4
>
> -ADASTRAP-amd64 = adastrap-amd64-11.2.0-5.tar.xz
> +# aarch64 bootstrap contains only gdc
> +ADASTRAP-aarch64 = adastrap-aarch64-11.2.0-0.tar.xz
> +ADASTRAP-amd64 = adastrap-amd64-11.2.0-6.tar.xz
> ADASTRAP-arm = adastrap-arm-4.9.4-0.tar.xz
> ADASTRAP-hppa = adastrap-hppa-8.3.0-1.tar.xz
> ADASTRAP-i386 = adastrap-i386-11.2.0-4.tar.xz
> @@ -34,6 +37,7 @@ PKGNAME-c++ = g++-${FULL_PKGVERSION}
> PKGNAME-f95 = g95-${FULL_PKGVERSION}
> PKGNAME-objc = gobjc-${FULL_PKGVERSION}
> PKGNAME-ada = gnat-${FULL_PKGVERSION}
> +PKGNAME-dlang = gdc-${FULL_PKGVERSION}
> PKGSPEC-main = gcc->=15,<16
>
> SHARED_LIBS = estdc++ 21.0 \
> @@ -45,12 +49,14 @@ SHARED_LIBS = estdc++ 21.0 \
> quadmath 5.0 \
> cc1 3.0 \
> cc1plugin 3.0 \
> - cp1plugin 2.0
> + cp1plugin 2.0 \
> + gphobos 1.0 \
> + gdruntime 1.0
>
> PSEUDO_FLAVORS = no_ada full
> FLAVOR ?=
>
> -MULTI_PACKAGES = -main -libs -f95 -objc -c++ -ada
> +MULTI_PACKAGES = -main -libs -f95 -objc -c++ -ada -dlang
>
> .include <bsd.port.arch.mk>
>
> @@ -83,11 +89,12 @@ TEST_DEPENDS += devel/dejagnu \
> ${BUILD_PKGPATH},-libs>=15,<16
>
> LANGS = c,c++,fortran,objc
> -.if ${BUILD_PACKAGES:M-ada}
> +.if ${BUILD_PACKAGES:M-ada} || ${BUILD_PACKAGES:M-dlang}
> DISTFILES.strap += ${ADASTRAP-${MACHINE_ARCH}}
> EXTRACT_ONLY += ${ADASTRAP-${MACHINE_ARCH}}
> CC = ${WRKDIR}/bin/egcc
> CXX = ${WRKDIR}/bin/eg++
> +GDC = ${WRKDIR}/bin/egdc
> # make sure we link the right libestdc++.a in stage1 when using a bootstrap
> CONFIGURE_ARGS += --with-stage1-ldflags="-L${WRKDIR}/bootstrap/lib"
> .elif ${PROPERTIES:Mgcc4}
> @@ -102,6 +109,10 @@ LANGS := ${LANGS},ada
> TEST_DEPENDS += ${BUILD_PKGPATH},-ada
> .endif
>
> +.if ${BUILD_PACKAGES:M-dlang}
> +LANGS := ${LANGS},d
> +.endif
> +
> CONFIGURE_STYLE = gnu
> MODGNU_CONFIG_GUESS_DIRS = ${WRKSRC} ${WRKSRC}/gcc
>
> @@ -110,6 +121,7 @@ EXTRA_ENV += ac_cv_prog_M4=/usr/bin/m4
> EXTRA_ENV += ac_cv_header_magic_h=no
> EXTRA_ENV += lt_cv_path_SED=/usr/bin/sed
> EXTRA_ENV += STRIP=/usr/bin/strip
> +EXTRA_ENV += GDC=${GDC}
> MAKE_FLAGS += ac_cv_path_mkdir=/bin/mkdir
>
> CONFIGURE_ENV += ${EXTRA_ENV}
> @@ -236,7 +248,7 @@ LIB_DEPENDS += devel/gmp,no_cxx,bootstr
> LIB_DEPENDS-libs =
>
> post-extract:
> -.for f in egcc eg++
> +.for f in egcc eg++ egdc
> echo "#! /bin/sh" >${WRKDIR}/bin/$f
> echo 'GNAT_ROOT=${WRKDIR}/bootstrap GCC_ROOT=${WRKDIR}/bootstrap LD_LIBRARY_PATH=${WRKDIR}/bootstrap/system-libs exec ${WRKDIR}/bootstrap/bin/$f "$$@"' >>${WRKDIR}/bin/$f
> chmod a+x ${WRKDIR}/bin/$f
> @@ -277,6 +289,7 @@ post-install:
>
> ADA_PACKAGE = ${PACKAGE_REPOSITORY}/${MACHINE_ARCH}/all/${FULLPKGNAME-ada}.tgz
> GCC_PACKAGE = ${PACKAGE_REPOSITORY}/${MACHINE_ARCH}/all/${FULLPKGNAME-main}.tgz
> +GDC_PACKAGE = ${PACKAGE_REPOSITORY}/${MACHINE_ARCH}/all/${FULLPKGNAME-dlang}.tgz
> GXX_PACKAGE = ${PACKAGE_REPOSITORY}/${MACHINE_ARCH}/all/${FULLPKGNAME-c++}.tgz
>
> .PHONY: bootstrap
> @@ -284,8 +297,13 @@ GXX_PACKAGE = ${PACKAGE_REPOSITORY}/${MA
> bootstrap: ${ADA_PACKAGE} ${GCC_PACKAGE} ${GXX_PACKAGE}
> ${_PBUILD} rm -rf ${WRKDIR}/prepare
> ${_PBUILD} mkdir -p ${WRKDIR}/prepare/bootstrap/system-libs
> +.if ${BUILD_PACKAGES:M-ada}
> cd ${WRKDIR}/prepare/bootstrap && ${_PBUILD} tar xzf ${ADA_PACKAGE}
> +.endif
> cd ${WRKDIR}/prepare/bootstrap && ${_PBUILD} tar xzf ${GCC_PACKAGE}
> +.if ${BUILD_PACKAGES:M-dlang}
> + cd ${WRKDIR}/prepare/bootstrap && ${_PBUILD} tar xzf ${GDC_PACKAGE}
> +.endif
> cd ${WRKDIR}/prepare/bootstrap && ${_PBUILD} tar xzf ${GXX_PACKAGE}
> ${_PBUILD} rm -rf ${WRKDIR}/prepare/bootstrap/{+*,info,man,share}
> ${_PBUILD} rm -rf ${WRKDIR}/prepare/bootstrap/lib/gcc/*-openbsd*/$V/include-fixed
> Index: 15/distinfo
> ===================================================================
> RCS file: /cvs/ports/lang/gcc/15/distinfo,v
> diff -u -p -r1.5 distinfo
> --- 15/distinfo 2 Nov 2025 18:48:50 -0000 1.5
> +++ 15/distinfo 1 Dec 2025 01:56:58 -0000
> @@ -1,8 +1,10 @@
> -SHA256 (gcc/adastrap-amd64-11.2.0-5.tar.xz) = xv2mjPXOBPnrbP98RlbKmbNgE3iP8MHBrShaipe/YNI=
> +SHA256 (gcc/adastrap-aarch64-11.2.0-0.tar.xz) = rVm75YiR/GJ6lsS9PbTaCmE5G4Q7CpXo5924ag3lqro=
> +SHA256 (gcc/adastrap-amd64-11.2.0-6.tar.xz) = rxI866IO57k5nZGBVbaGynN0XRcA4QJIN1AAW3xNA1w=
> SHA256 (gcc/adastrap-mips64-8.4.0-5.tar.xz) = Rfwenft0B3hxydQ3mqkkbFN40maQ73Jl4fgTFn1eNKQ=
> SHA256 (gcc/adastrap-powerpc-11.2.0-3.tar.xz) = acJtrhP/QyqtfDHrcXZjwI1LIBBN8C+SrTokVunndSQ=
> SHA256 (gcc/gcc-15.2.0.tar.xz) = Q4/ZloJrDIJIWinaA6ctcdbjVBqD7HAt9Ccfb+Al0k4=
> -SIZE (gcc/adastrap-amd64-11.2.0-5.tar.xz) = 78100312
> +SIZE (gcc/adastrap-aarch64-11.2.0-0.tar.xz) = 67081156
> +SIZE (gcc/adastrap-amd64-11.2.0-6.tar.xz) = 100826604
> SIZE (gcc/adastrap-mips64-8.4.0-5.tar.xz) = 49877060
> SIZE (gcc/adastrap-powerpc-11.2.0-3.tar.xz) = 70134604
> SIZE (gcc/gcc-15.2.0.tar.xz) = 101056276
> Index: 15/patches/patch-Makefile_in
> ===================================================================
> RCS file: /cvs/ports/lang/gcc/15/patches/patch-Makefile_in,v
> diff -u -p -r1.1.1.1 patch-Makefile_in
> --- 15/patches/patch-Makefile_in 18 Aug 2025 19:49:19 -0000 1.1.1.1
> +++ 15/patches/patch-Makefile_in 1 Dec 2025 01:56:58 -0000
> @@ -1,7 +1,15 @@
> Index: Makefile.in
> --- Makefile.in.orig
> +++ Makefile.in
> -@@ -2898,7 +2898,7 @@ install:
> +@@ -621,7 +621,6 @@ STAGE1_CONFIGURE_FLAGS = $(STAGE1_CHECKING) \
> +
> + @if target-libphobos-bootstrap
> + STAGE1_CONFIGURE_FLAGS += --with-libphobos-druntime-only
> +-STAGE2_CONFIGURE_FLAGS += --with-libphobos-druntime-only
> + @endif target-libphobos-bootstrap
> +
> + # When using the slow stage1 compiler disable IL verification and forcefully
> +@@ -2898,7 +2897,7 @@ install:
> @: $(MAKE); $(unstage)
> @r=`${PWD_COMMAND}`; export r; \
> s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
> @@ -10,7 +18,7 @@ Index: Makefile.in
>
> .PHONY: install-host-nogcc
> install-host-nogcc: \
> -@@ -3222,7 +3222,7 @@ configure-build-libiberty:
> +@@ -3222,7 +3221,7 @@ configure-build-libiberty:
> esac; \
> module_srcdir=libiberty; \
> rm -f no-such-file || : ; \
> @@ -19,7 +27,7 @@ Index: Makefile.in
> $$s/$$module_srcdir/configure \
> --srcdir=$${topdir}/$$module_srcdir \
> $(BUILD_CONFIGARGS) --build=${build_alias} --host=${build_alias} \
> -@@ -3279,7 +3279,7 @@ configure-build-bison:
> +@@ -3279,7 +3278,7 @@ configure-build-bison:
> esac; \
> module_srcdir=bison; \
> rm -f no-such-file || : ; \
> @@ -28,7 +36,7 @@ Index: Makefile.in
> $$s/$$module_srcdir/configure \
> --srcdir=$${topdir}/$$module_srcdir \
> $(BUILD_CONFIGARGS) --build=${build_alias} --host=${build_alias} \
> -@@ -3336,7 +3336,7 @@ configure-build-flex:
> +@@ -3336,7 +3335,7 @@ configure-build-flex:
> esac; \
> module_srcdir=flex; \
> rm -f no-such-file || : ; \
> @@ -37,7 +45,7 @@ Index: Makefile.in
> $$s/$$module_srcdir/configure \
> --srcdir=$${topdir}/$$module_srcdir \
> $(BUILD_CONFIGARGS) --build=${build_alias} --host=${build_alias} \
> -@@ -3393,7 +3393,7 @@ configure-build-m4:
> +@@ -3393,7 +3392,7 @@ configure-build-m4:
> esac; \
> module_srcdir=m4; \
> rm -f no-such-file || : ; \
> @@ -46,7 +54,7 @@ Index: Makefile.in
> $$s/$$module_srcdir/configure \
> --srcdir=$${topdir}/$$module_srcdir \
> $(BUILD_CONFIGARGS) --build=${build_alias} --host=${build_alias} \
> -@@ -3450,7 +3450,7 @@ configure-build-texinfo:
> +@@ -3450,7 +3449,7 @@ configure-build-texinfo:
> esac; \
> module_srcdir=texinfo; \
> rm -f no-such-file || : ; \
> @@ -55,7 +63,7 @@ Index: Makefile.in
> $$s/$$module_srcdir/configure \
> --srcdir=$${topdir}/$$module_srcdir \
> $(BUILD_CONFIGARGS) --build=${build_alias} --host=${build_alias} \
> -@@ -3507,7 +3507,7 @@ configure-build-fixincludes:
> +@@ -3507,7 +3506,7 @@ configure-build-fixincludes:
> esac; \
> module_srcdir=fixincludes; \
> rm -f no-such-file || : ; \
> @@ -64,7 +72,7 @@ Index: Makefile.in
> $$s/$$module_srcdir/configure \
> --srcdir=$${topdir}/$$module_srcdir \
> $(BUILD_CONFIGARGS) --build=${build_alias} --host=${build_alias} \
> -@@ -3564,7 +3564,7 @@ configure-build-libcpp:
> +@@ -3564,7 +3563,7 @@ configure-build-libcpp:
> esac; \
> module_srcdir=libcpp; \
> rm -f no-such-file || : ; \
> @@ -73,7 +81,7 @@ Index: Makefile.in
> $$s/$$module_srcdir/configure \
> --srcdir=$${topdir}/$$module_srcdir \
> $(BUILD_CONFIGARGS) --build=${build_alias} --host=${build_alias} \
> -@@ -45191,7 +45191,7 @@ configure-target-libstdc++-v3:
> +@@ -45191,7 +45190,7 @@ configure-target-libstdc++-v3:
> esac; \
> module_srcdir=libstdc++-v3; \
> rm -f no-such-file || : ; \
> @@ -82,7 +90,7 @@ Index: Makefile.in
> $$s/$$module_srcdir/configure \
> --srcdir=$${topdir}/$$module_srcdir \
> $(TARGET_CONFIGARGS) --build=${build_alias} --host=${target_alias} \
> -@@ -46461,7 +46461,7 @@ configure-target-libsanitizer:
> +@@ -46461,7 +46460,7 @@ configure-target-libsanitizer:
> esac; \
> module_srcdir=libsanitizer; \
> rm -f no-such-file || : ; \
> @@ -91,7 +99,7 @@ Index: Makefile.in
> $$s/$$module_srcdir/configure \
> --srcdir=$${topdir}/$$module_srcdir \
> $(TARGET_CONFIGARGS) --build=${build_alias} --host=${target_alias} \
> -@@ -47731,7 +47731,7 @@ configure-target-libvtv:
> +@@ -47731,7 +47730,7 @@ configure-target-libvtv:
> esac; \
> module_srcdir=libvtv; \
> rm -f no-such-file || : ; \
> @@ -100,7 +108,7 @@ Index: Makefile.in
> $$s/$$module_srcdir/configure \
> --srcdir=$${topdir}/$$module_srcdir \
> $(TARGET_CONFIGARGS) --build=${build_alias} --host=${target_alias} \
> -@@ -49002,7 +49002,7 @@ configure-target-libssp:
> +@@ -49002,7 +49001,7 @@ configure-target-libssp:
> esac; \
> module_srcdir=libssp; \
> rm -f no-such-file || : ; \
> @@ -109,7 +117,7 @@ Index: Makefile.in
> $$s/$$module_srcdir/configure \
> --srcdir=$${topdir}/$$module_srcdir \
> $(TARGET_CONFIGARGS) --build=${build_alias} --host=${target_alias} \
> -@@ -49487,7 +49487,7 @@ configure-target-newlib:
> +@@ -49487,7 +49486,7 @@ configure-target-newlib:
> esac; \
> module_srcdir=newlib; \
> rm -f no-such-file || : ; \
> @@ -118,7 +126,7 @@ Index: Makefile.in
> $$s/$$module_srcdir/configure \
> --srcdir=$${topdir}/$$module_srcdir \
> $(TARGET_CONFIGARGS) --build=${build_alias} --host=${target_alias} \
> -@@ -49971,7 +49971,7 @@ configure-target-libgcc:
> +@@ -49971,7 +49970,7 @@ configure-target-libgcc:
> esac; \
> module_srcdir=libgcc; \
> rm -f no-such-file || : ; \
> @@ -127,7 +135,7 @@ Index: Makefile.in
> $$s/$$module_srcdir/configure \
> --srcdir=$${topdir}/$$module_srcdir \
> $(TARGET_CONFIGARGS) --build=${build_alias} --host=${target_alias} \
> -@@ -51203,7 +51203,7 @@ configure-target-libbacktrace:
> +@@ -51203,7 +51202,7 @@ configure-target-libbacktrace:
> esac; \
> module_srcdir=libbacktrace; \
> rm -f no-such-file || : ; \
> @@ -136,7 +144,7 @@ Index: Makefile.in
> $$s/$$module_srcdir/configure \
> --srcdir=$${topdir}/$$module_srcdir \
> $(TARGET_CONFIGARGS) --build=${build_alias} --host=${target_alias} \
> -@@ -52474,7 +52474,7 @@ configure-target-libquadmath:
> +@@ -52474,7 +52473,7 @@ configure-target-libquadmath:
> esac; \
> module_srcdir=libquadmath; \
> rm -f no-such-file || : ; \
> @@ -145,7 +153,7 @@ Index: Makefile.in
> $$s/$$module_srcdir/configure \
> --srcdir=$${topdir}/$$module_srcdir \
> $(TARGET_CONFIGARGS) --build=${build_alias} --host=${target_alias} \
> -@@ -52959,7 +52959,7 @@ configure-target-libgfortran:
> +@@ -52959,7 +52958,7 @@ configure-target-libgfortran:
> esac; \
> module_srcdir=libgfortran; \
> rm -f no-such-file || : ; \
> @@ -154,7 +162,7 @@ Index: Makefile.in
> $$s/$$module_srcdir/configure \
> --srcdir=$${topdir}/$$module_srcdir \
> $(TARGET_CONFIGARGS) --build=${build_alias} --host=${target_alias} \
> -@@ -53444,7 +53444,7 @@ configure-target-libobjc:
> +@@ -53444,7 +53443,7 @@ configure-target-libobjc:
> esac; \
> module_srcdir=libobjc; \
> rm -f no-such-file || : ; \
> @@ -163,7 +171,7 @@ Index: Makefile.in
> $$s/$$module_srcdir/configure \
> --srcdir=$${topdir}/$$module_srcdir \
> $(TARGET_CONFIGARGS) --build=${build_alias} --host=${target_alias} \
> -@@ -53896,7 +53896,7 @@ configure-target-libgo:
> +@@ -53896,7 +53895,7 @@ configure-target-libgo:
> esac; \
> module_srcdir=libgo; \
> rm -f no-such-file || : ; \
> @@ -172,7 +180,7 @@ Index: Makefile.in
> $$s/$$module_srcdir/configure \
> --srcdir=$${topdir}/$$module_srcdir \
> $(TARGET_CONFIGARGS) --build=${build_alias} --host=${target_alias} \
> -@@ -54380,7 +54380,7 @@ configure-target-libphobos:
> +@@ -54380,7 +54379,7 @@ configure-target-libphobos:
> esac; \
> module_srcdir=libphobos; \
> rm -f no-such-file || : ; \
> @@ -181,7 +189,7 @@ Index: Makefile.in
> $$s/$$module_srcdir/configure \
> --srcdir=$${topdir}/$$module_srcdir \
> $(TARGET_CONFIGARGS) --build=${build_alias} --host=${target_alias} \
> -@@ -55651,7 +55651,7 @@ configure-target-libtermcap:
> +@@ -55651,7 +55650,7 @@ configure-target-libtermcap:
> esac; \
> module_srcdir=libtermcap; \
> rm -f no-such-file || : ; \
> @@ -190,7 +198,7 @@ Index: Makefile.in
> $$s/$$module_srcdir/configure \
> --srcdir=$${topdir}/$$module_srcdir \
> $(TARGET_CONFIGARGS) --build=${build_alias} --host=${target_alias} \
> -@@ -56071,7 +56071,7 @@ configure-target-winsup:
> +@@ -56071,7 +56070,7 @@ configure-target-winsup:
> esac; \
> module_srcdir=winsup; \
> rm -f no-such-file || : ; \
> @@ -199,7 +207,7 @@ Index: Makefile.in
> $$s/$$module_srcdir/configure \
> --srcdir=$${topdir}/$$module_srcdir \
> $(TARGET_CONFIGARGS) --build=${build_alias} --host=${target_alias} \
> -@@ -56556,7 +56556,7 @@ configure-target-libgloss:
> +@@ -56556,7 +56555,7 @@ configure-target-libgloss:
> esac; \
> module_srcdir=libgloss; \
> rm -f no-such-file || : ; \
> @@ -208,7 +216,7 @@ Index: Makefile.in
> $$s/$$module_srcdir/configure \
> --srcdir=$${topdir}/$$module_srcdir \
> $(TARGET_CONFIGARGS) --build=${build_alias} --host=${target_alias} \
> -@@ -57036,7 +57036,7 @@ configure-target-libffi:
> +@@ -57036,7 +57035,7 @@ configure-target-libffi:
> esac; \
> module_srcdir=libffi; \
> rm -f no-such-file || : ; \
> @@ -217,7 +225,7 @@ Index: Makefile.in
> $$s/$$module_srcdir/configure \
> --srcdir=$${topdir}/$$module_srcdir \
> $(TARGET_CONFIGARGS) --build=${build_alias} --host=${target_alias} \
> -@@ -57510,7 +57510,7 @@ configure-target-zlib:
> +@@ -57510,7 +57509,7 @@ configure-target-zlib:
> esac; \
> module_srcdir=zlib; \
> rm -f no-such-file || : ; \
> @@ -226,7 +234,7 @@ Index: Makefile.in
> $$s/$$module_srcdir/configure \
> --srcdir=$${topdir}/$$module_srcdir \
> $(TARGET_CONFIGARGS) --build=${build_alias} --host=${target_alias} \
> -@@ -58781,7 +58781,7 @@ configure-target-rda:
> +@@ -58781,7 +58780,7 @@ configure-target-rda:
> esac; \
> module_srcdir=rda; \
> rm -f no-such-file || : ; \
> @@ -235,7 +243,7 @@ Index: Makefile.in
> $$s/$$module_srcdir/configure \
> --srcdir=$${topdir}/$$module_srcdir \
> $(TARGET_CONFIGARGS) --build=${build_alias} --host=${target_alias} \
> -@@ -59266,7 +59266,7 @@ configure-target-libada:
> +@@ -59266,7 +59265,7 @@ configure-target-libada:
> esac; \
> module_srcdir=libada; \
> rm -f no-such-file || : ; \
> @@ -244,7 +252,7 @@ Index: Makefile.in
> $$s/$$module_srcdir/configure \
> --srcdir=$${topdir}/$$module_srcdir \
> $(TARGET_CONFIGARGS) --build=${build_alias} --host=${target_alias} \
> -@@ -59751,7 +59751,7 @@ configure-target-libgm2:
> +@@ -59751,7 +59750,7 @@ configure-target-libgm2:
> esac; \
> module_srcdir=libgm2; \
> rm -f no-such-file || : ; \
> @@ -253,7 +261,7 @@ Index: Makefile.in
> $$s/$$module_srcdir/configure \
> --srcdir=$${topdir}/$$module_srcdir \
> $(TARGET_CONFIGARGS) --build=${build_alias} --host=${target_alias} \
> -@@ -60235,7 +60235,7 @@ configure-target-libgomp:
> +@@ -60235,7 +60234,7 @@ configure-target-libgomp:
> esac; \
> module_srcdir=libgomp; \
> rm -f no-such-file || : ; \
> @@ -262,7 +270,7 @@ Index: Makefile.in
> $$s/$$module_srcdir/configure \
> --srcdir=$${topdir}/$$module_srcdir \
> $(TARGET_CONFIGARGS) --build=${build_alias} --host=${target_alias} \
> -@@ -61506,7 +61506,7 @@ configure-target-libitm:
> +@@ -61506,7 +61505,7 @@ configure-target-libitm:
> esac; \
> module_srcdir=libitm; \
> rm -f no-such-file || : ; \
> @@ -271,7 +279,7 @@ Index: Makefile.in
> $$s/$$module_srcdir/configure \
> --srcdir=$${topdir}/$$module_srcdir \
> $(TARGET_CONFIGARGS) --build=${build_alias} --host=${target_alias} \
> -@@ -61990,7 +61990,7 @@ configure-target-libatomic:
> +@@ -61990,7 +61989,7 @@ configure-target-libatomic:
> esac; \
> module_srcdir=libatomic; \
> rm -f no-such-file || : ; \
> @@ -280,7 +288,7 @@ Index: Makefile.in
> $$s/$$module_srcdir/configure \
> --srcdir=$${topdir}/$$module_srcdir \
> $(TARGET_CONFIGARGS) --build=${build_alias} --host=${target_alias} \
> -@@ -63261,7 +63261,7 @@ configure-target-libgrust:
> +@@ -63261,7 +63260,7 @@ configure-target-libgrust:
> esac; \
> module_srcdir=libgrust; \
> rm -f no-such-file || : ; \
> Index: 15/patches/patch-gcc_d_Make-lang_in
> ===================================================================
> RCS file: 15/patches/patch-gcc_d_Make-lang_in
> diff -N 15/patches/patch-gcc_d_Make-lang_in
> --- /dev/null 1 Jan 1970 00:00:00 -0000
> +++ 15/patches/patch-gcc_d_Make-lang_in 1 Dec 2025 01:56:58 -0000
> @@ -0,0 +1,12 @@
> +Index: gcc/d/Make-lang.in
> +--- gcc/d/Make-lang.in.orig
> ++++ gcc/d/Make-lang.in
> +@@ -67,7 +67,7 @@ ALL_DFLAGS = $(DFLAGS-$@) $(GDCFLAGS) -fversion=IN_GCC
> + DCOMPILE.base = $(GDC) -c $(ALL_DFLAGS) -o $@
> + DCOMPILE = $(DCOMPILE.base) -MT $@ -MMD -MP -MF $(@D)/$(DEPDIR)/$(basename $(@F)).TPo
> + DPOSTCOMPILE = @mv $(@D)/$(DEPDIR)/$(basename $(@F)).TPo $(@D)/$(DEPDIR)/$(basename $(@F)).Po
> +-DLINKER = $(GDC) $(NO_PIE_FLAG) -lstdc++
> ++DLINKER = $(GDC) $(NO_PIE_FLAG) -lestdc++
> +
> + # Like LINKER, but use a mutex for serializing front end links.
> + ifeq ($(DO_LINK_MUTEX),true)
> Index: 15/patches/patch-gcc_d_d-lang_cc
> ===================================================================
> RCS file: 15/patches/patch-gcc_d_d-lang_cc
> diff -N 15/patches/patch-gcc_d_d-lang_cc
> --- /dev/null 1 Jan 1970 00:00:00 -0000
> +++ 15/patches/patch-gcc_d_d-lang_cc 1 Dec 2025 01:56:58 -0000
> @@ -0,0 +1,16 @@
> +Index: gcc/d/d-lang.cc
> +--- gcc/d/d-lang.cc.orig
> ++++ gcc/d/d-lang.cc
> +@@ -1964,6 +1964,12 @@ const scoped_attribute_specs *const d_langhook_attribu
> + &d_langhook_common_attribute_table,
> + };
> +
> ++extern "C" const char *
> ++fname_as_string(int pretty_p __attribute__((__unused__)))
> ++{
> ++ return NULL;
> ++}
> ++
> + /* Definitions for our language-specific hooks. */
> +
> + #undef LANG_HOOKS_NAME
> Index: 15/patches/patch-gcc_d_d-longdouble_cc
> ===================================================================
> RCS file: 15/patches/patch-gcc_d_d-longdouble_cc
> diff -N 15/patches/patch-gcc_d_d-longdouble_cc
> --- /dev/null 1 Jan 1970 00:00:00 -0000
> +++ 15/patches/patch-gcc_d_d-longdouble_cc 1 Dec 2025 01:56:58 -0000
> @@ -0,0 +1,22 @@
> +Index: gcc/d/d-longdouble.cc
> +--- gcc/d/d-longdouble.cc.orig
> ++++ gcc/d/d-longdouble.cc
> +@@ -86,6 +86,18 @@ longdouble::set (uint64_t d)
> + UNSIGNED);
> + }
> +
> ++#if defined(__OpenBSD__) && defined(__LP64__)
> ++void longdouble::set(long d)
> ++{
> ++ set((int64_t)d);
> ++}
> ++
> ++void longdouble::set(unsigned long d)
> ++{
> ++ set((uint64_t)d);
> ++}
> ++