From nobody Wed Oct 07 23:58:19 2026 X-Original-To: dev-commits-src-branches@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4j0VSW2Gm7z6cV9f for ; Wed, 07 Oct 2026 23:58:19 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange x25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "YR2" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id 4j0VSW10jQz3PFk for ; Wed, 07 Oct 2026 23:58:19 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1791417499; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=AEJZRNWmEK2lhRMjOtxZX4vQ7ePkZ7xs9wVJuuXrIYA=; b=nYGi/XCqnNX+lxJCsEtrwiwZMoECsVkaNtuq5frJ5BTlbvJi11aTZntDHJIzOh5sW8+A94 y6nbid0prpi2JMBJqHUtZ4vHrlVkoUmHjHi03Fz8XT40vkaE5qRpf1i+qFfYFUOEAaIA70 ExnQKMoNYQ4tGxb3FBCjKp7i14N2X/imyYM1vcliGtOYEzwMh9jVkLWlLpQ6hGogvwuoGa jUA3BQ7ng+fEQ2Dn3P2MEqrpKNAAvuCbglaNvs4nrhMGrgqThS8dlsP8vlG7KvRgDRcKj3 rcVq0o68UmBNMhad13B5aiKzYR/cAWn2IHYrbl4lT492bIL5gOlbMKXhjT4OFw== ARC-Seal: i=1; a=rsa-sha256; d=freebsd.org; s=dkim; cv=none; t=1791417499; b=haP7gV45LN6LsK98m9LLtWQ5ZTMRoLzP3d3FCWmV8dGahGCm6paLNnBacUMrXLyui8Bct/ afJfJNvJEZ02ycbJw6qHwKeOWoJPYKkjP/19kgWLIQlgW6HliB7KsWpSMVE97NVge1Ur0P 5H7RmbOBe3YCtnBwtenUEIeussIYElI9T/BbD/9Fr1VFrKazsRtpw/t3YKw+5tXghzIiUw LC4hU+G1pwtF1mLsjUENPIr6JUwzO6VWXIWlWaRXyeJilzJxG+noC7bT87RcNN7g+SqRC/ FLUGU3R1jLcZBZo5LGJN1UNjimfzwSsNxOAYxn12mJWbNqrcirLeFQhIpsfyNw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1791417499; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=AEJZRNWmEK2lhRMjOtxZX4vQ7ePkZ7xs9wVJuuXrIYA=; b=rWq8/5rXVU4t+0n7DMCLfnFFQ50/tujurauemtAHNM+XAPWgGg8gKIRGuh58q9JbVUHdXZ CNROqwCPkqBr9UtibH1PjGO3lZfcIn97/Y5Y/eKrmz2UNs4swRL8WSMNmDbKU/2rbAPcHM YHmG3u5bugv4XWH0aro9LrhXQtkVI3wtVZpA+FguX4hhqB2zzJ3tPxuIC0hlMkW2txxT5q pTzCiBJu7sOGF3KMx9efGyMv+SQOXBGLU2PWNhQwgbchrY7++om+8T/+j/wVZXv5dr65yA rJBs6/syfvR2pxoo5qmq/utvLCtsRv9O4LgXiaF7Lb1kcwl+ah4Vzc8BW5voow== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4j0VSW04mYzFsR for ; Wed, 07 Oct 2026 23:58:19 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 43810 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Wed, 07 Oct 2026 23:58:19 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Siva Mahadevan Subject: git: a689dd9f2b17 - stable/15 - libgcc_s: add libgcc_s_asneeded.so wrapper for gcc 16 List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-branches@freebsd.org Sender: owner-dev-commits-src-branches@FreeBSD.org List-Id: List-Post: List-Help: List-Subscribe: List-Unsubscribe: List-Owner: Precedence: list MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: siva X-Git-Repository: src X-Git-Refname: refs/heads/stable/15 X-Git-Reftype: branch X-Git-Commit: a689dd9f2b1798c7152b08019f7826935c04e9e0 Auto-Submitted: auto-generated Date: Wed, 07 Oct 2026 23:58:19 +0000 Message-Id: <6ac6dc9b.43810.46c52623@gitrepo.freebsd.org> The branch stable/15 has been updated by siva: URL: https://cgit.FreeBSD.org/src/commit/?id=a689dd9f2b1798c7152b08019f7826935c04e9e0 commit a689dd9f2b1798c7152b08019f7826935c04e9e0 Author: Siva Mahadevan AuthorDate: 2026-09-28 15:07:56 +0000 Commit: Siva Mahadevan CommitDate: 2026-10-07 23:56:48 +0000 libgcc_s: add libgcc_s_asneeded.so wrapper for gcc 16 GCC 16[0][1] now requires a wrapper lib to handle `--push-state --as-needed -lgcc_s --pop-state` logic[1] for `gcc` invocations. `g++` will still unconditionally use `-lgcc_s`. This fixes buildworld with gcc16. [0] https://gcc.gnu.org/git/?p=gcc.git;a=commit;h=8a99fdb70493df1294b53406913e5ea1fc971c13 [1] https://gcc.gnu.org/bugzilla/show_bug.cgi?id=123396 Reviewed by: jhb MFC after: 3 days Sponsored by: The FreeBSD Foundation Differential Revision: https://reviews.freebsd.org/D59511 Squashed commits including fixups: (cherry picked from commit fdd3f6f78888b02a1bfa69a0572317413dc14a45) (cherry picked from commit b45d14d3d665e0253391924e5c0595c259b8a773) (cherry picked from commit 222210c6a82282de78aa863c550da21471630316) --- Makefile.inc1 | 7 ++++--- lib/Makefile | 1 + lib/libgcc_s_asneeded/Makefile | 11 +++++++++++ lib/libgcc_s_asneeded/libgcc_s_asneeded.ldscript | 1 + share/mk/bsd.lib.mk | 2 +- 5 files changed, 18 insertions(+), 4 deletions(-) diff --git a/Makefile.inc1 b/Makefile.inc1 index fb2a5e2ce527..162951157c2d 100644 --- a/Makefile.inc1 +++ b/Makefile.inc1 @@ -3304,13 +3304,14 @@ _startup_libs+= lib/libc_nonshared _startup_libs+= lib/libcxxrt _startup_libs+= lib/libsys -_prereq_libs+= lib/libgcc_eh lib/libgcc_s -_startup_libs+= lib/libgcc_eh lib/libgcc_s +_prereq_libs+= lib/libgcc_eh lib/libgcc_s lib/libgcc_s_asneeded +_startup_libs+= lib/libgcc_eh lib/libgcc_s lib/libgcc_s_asneeded lib/libc__L: lib/libsys__L lib/libgcc_s__L: lib/libc__L lib/libgcc_s__L: lib/libc_nonshared__L -lib/libcxxrt__L: lib/libgcc_s__L +lib/libgcc_s_asneeded__L: lib/libgcc_s__L +lib/libcxxrt__L: lib/libgcc_s_asneeded__L lib/libcrypt__L: lib/libmd__L _prebuild_libs= ${_kerberos5_lib_libasn1} \ diff --git a/lib/Makefile b/lib/Makefile index 6e2ff634c963..f1d72e025c81 100644 --- a/lib/Makefile +++ b/lib/Makefile @@ -61,6 +61,7 @@ SUBDIR= ${SUBDIR_BOOTSTRAP} \ libfetch \ libgcc_eh \ libgcc_s \ + libgcc_s_asneeded \ libgeom \ libifconfig \ libipsec \ diff --git a/lib/libgcc_s_asneeded/Makefile b/lib/libgcc_s_asneeded/Makefile new file mode 100644 index 000000000000..eb59daac50f8 --- /dev/null +++ b/lib/libgcc_s_asneeded/Makefile @@ -0,0 +1,11 @@ +PACKAGE= clibs +SHLIB_NAME= libgcc_s_asneeded.so.1 +SHLIBDIR?= /lib + +SHLIB_LDSCRIPT= libgcc_s_asneeded.ldscript + +.include + +LDFLAGS+= -nodefaultlibs + +.include diff --git a/lib/libgcc_s_asneeded/libgcc_s_asneeded.ldscript b/lib/libgcc_s_asneeded/libgcc_s_asneeded.ldscript new file mode 100644 index 000000000000..3461e92fa7ca --- /dev/null +++ b/lib/libgcc_s_asneeded/libgcc_s_asneeded.ldscript @@ -0,0 +1 @@ +INPUT (AS_NEEDED(-lgcc_s)) diff --git a/share/mk/bsd.lib.mk b/share/mk/bsd.lib.mk index e3b3d760ff28..5b7bed041b8f 100644 --- a/share/mk/bsd.lib.mk +++ b/share/mk/bsd.lib.mk @@ -291,7 +291,7 @@ ${SHLIB_NAME_FULL}: ${SOBJS} .endif ${_LD:N${CCACHE_BIN}} ${LDFLAGS} ${SSP_CFLAGS} ${SOLINKOPTS} \ -o ${.TARGET} -Wl,-soname,${SONAME} ${SOBJS} ${LDADD} -.if ${MK_CTF} != "no" +.if ${MK_CTF} != "no" && defined(SOBJS) && !empty(SOBJS) ${CTFMERGE} ${CTFFLAGS} -o ${.TARGET} ${SOBJS} .endif