From nobody Tue Feb 04 00:29:46 2025 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 4Yn44q68C3z5mmDx; Tue, 04 Feb 2025 00:29:47 +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 "R11" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4Yn44q06kHz471M; Tue, 04 Feb 2025 00:29:47 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1738628987; 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=/sg2J+oDe/9ldMUn6MP62hazUqI+8E8AWKMwtxT/9kE=; b=q04frMwSoJ2OP2fCjO1F4vHi/Ew9/vZZKClrqMkfyvYm5KnokKc5geAnL0RM+4wz7DdAmE d3p+Dudq8mYvaglG+029stgGTX8983SixpxzIz6kK0jaf/+MTSGkfpa3iE+oG22bf+ZWPi XPHk8pgVbIJnli7QFW+xjx4goYuCENkD0r1KN97BuJtE8vT5/nYg5ZH41E7e8ZdiHAh2KP K+xACa42V9XtVm+68KnwzaQWII+127RDMHSFKnESZmNCz98QJ4NwIlvet338HBfz6zGmNA TEiMm+ob3hagDRQzahkexwNhBsjGAlIv6HAIsv5oS0Cgh9U+ifabUAhJ7WFB6w== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1738628987; 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=/sg2J+oDe/9ldMUn6MP62hazUqI+8E8AWKMwtxT/9kE=; b=n+ZKl/oxHcKaoUb3gtXwPaY/wME+GB8Gt9tmNQqzT/2r3uWMCc1pYw601+HK298/s8IYe1 BYo2rHPyj16xr0yOgySZDZUMERBt+WtW9WtPse/uym9LUGLDkDqk3ZgeOf1L9LIDGL/A/t Q1NbPFoGlF8Ft4hSqrM5taEJBlKcxKnTAmUNXpiRHuJDatwubgh1tl0uIKI23Kwem2jJC7 gsBpb+Zeic/yQscIdDZPFXv4ydOzmTzlodHSjfHMbaMtEiJjQf5+ldT2BQurzrzfJ+bnd3 /IxL0P8J1/GInr7pVUuUL+yw9fXsxMEZHNBeO4EzA8B/4ClfWzxrHCmmqxU8Ww== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1738628987; a=rsa-sha256; cv=none; b=Amu0/NLtg0ZYWX/im0uoCzo970fsVirxT92uIK1SiFJ1gLS+dOhhQ1CtE2ts40AuKmMzyu OaxJX1BYuPcuizPhDhF3jlEsBIkr75wUtCZjCE9s35SVi21rkH3pb6kiXV9H282QVz07Ly ZNquW9tg97FN3p5RJj3ZrvcspJb78sETBwbce/KCEQT56RYYAfP0dvwCrB5O2mKO/LV9m9 cYTm5ZYs9c1YeX4e3ixKOhNfX7xjY19Zlcj6gcPqB4pdvsf7+jpaFaV0+XWKwf3dvompHR nhUAHLH6aHecraHo/Rw4muVBUxChkLHDrVPy2eEM3hmoLlk9PHajjEG8EwWQaQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (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 did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4Yn44p6jGwzybY; Tue, 04 Feb 2025 00:29:46 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 5140Tk05097400; Tue, 4 Feb 2025 00:29:46 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 5140TkTs097397; Tue, 4 Feb 2025 00:29:46 GMT (envelope-from git) Date: Tue, 4 Feb 2025 00:29:46 GMT Message-Id: <202502040029.5140TkTs097397@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Konstantin Belousov Subject: git: 07324ed40901 - stable/14 - crtbegin: accurately check for the end of .dtors 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 MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: kib X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: 07324ed409012746c2b6ea4c06f00d39721c2378 Auto-Submitted: auto-generated The branch stable/14 has been updated by kib: URL: https://cgit.FreeBSD.org/src/commit/?id=07324ed409012746c2b6ea4c06f00d39721c2378 commit 07324ed409012746c2b6ea4c06f00d39721c2378 Author: Konstantin Belousov AuthorDate: 2025-01-27 19:21:20 +0000 Commit: Konstantin Belousov CommitDate: 2025-02-04 00:28:37 +0000 crtbegin: accurately check for the end of .dtors (cherry picked from commit 6ee34bca48a9e0867d46b24a78855e225d46ddda) --- lib/csu/common/crtbegin.c | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) diff --git a/lib/csu/common/crtbegin.c b/lib/csu/common/crtbegin.c index ddeec986a431..da6cdf14d47e 100644 --- a/lib/csu/common/crtbegin.c +++ b/lib/csu/common/crtbegin.c @@ -67,19 +67,27 @@ static crt_func __DTOR_LIST__[] __section(".dtors") __used = { (crt_func)-1 }; +extern const char startof_dtors[] __asm(".startof..dtors") + __weak_symbol __hidden; +extern const char sizeof_dtors[] __asm(".sizeof..dtors") + __weak_symbol __hidden; + static void __do_global_dtors_aux(void) { crt_func fn; + uintptr_t dtors_end; int n; #ifdef SHARED run_cxa_finalize(); #endif + dtors_end = (uintptr_t)&startof_dtors + (uintptr_t)&sizeof_dtors; for (n = 1;; n++) { fn = __DTOR_LIST__[n]; - if (fn == (crt_func)0 || fn == (crt_func)-1) + if (fn == (crt_func)0 || fn == (crt_func)-1 || (dtors_end > 0 && + (uintptr_t)&__DTOR_LIST__[n] >= dtors_end)) break; fn(); }