From nobody Sat Sep 12 00:28:06 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 4hhXLv1d6lz6rbFL for ; Sat, 12 Sep 2026 00:28:07 +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 4hhXLt5tzjz4n1m for ; Sat, 12 Sep 2026 00:28:06 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1789172886; 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=tCcCGc0+A01H8Db1SxWLqRXn69uYnhy6xe7ZzPo+5DY=; b=KD/ZCQUVpToyCPWjlIr2u39Ybb0rMVvEnw7/v4BPbTC1q3CKAW2MOCSTFKYB0dnTcODnt3 Sd20Pla1qWAENRC1nmfSdFVNhQ7VeCe+s/Jz2VY1XOBC3ve47ojSsZx31IBA4Je+dGWhuN UWL5ucw7F+mncLDiY5a6vl9K3bmqq9vK4K4zEElgkw6foAhIOf5f8N75n0nZ1nnP5jusF4 axkxBdOyTQZmEiHLgxjzIktByfLzzOmy1lZGr8NCZ3dszZiK+hPQ8Ase158o1dLAPcWUkS 6gkRAV6HjqGe+U8UbKsBjuLHYl77dUY5fLQu/NVaPRn1508Dm+5Zt3Zc/eyxQQ== ARC-Seal: i=1; a=rsa-sha256; d=freebsd.org; s=dkim; cv=none; t=1789172886; b=nGS2f7xfgUivYdEOC/M6MauPytXgwur+WLFi5GZalApOG0CidwT9MJCxexdigOZa3ZvQCc wOyL6e+P6CW2dfnHLn9epqBinEoHt01mwWyTPvxDS9GM5iGZtu/idUORxgbv8pM7nC6CPf U/lg7ABZMF19B739wu7SSvyp5PAhpoMxKuBn2yM7AKov0TU6ARz8dAYQZgr4CBlLijdtV9 JE+755ufaH3hUWG2Z1ASZ34jw9C/ZegoqhCbKAJbUSA//f8KSW1nR6kzVP2du3s01kh/2X /WkpwarqAyX7urjhJj3W+qBSV62wKCdmZygSI8R/mmPi1mrwoIzDXWMFoYnaFw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1789172886; 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=tCcCGc0+A01H8Db1SxWLqRXn69uYnhy6xe7ZzPo+5DY=; b=KnPppvOo5zq1mfF0EqTWqMg1NglPWqO2ELVZuvCVYDyXOn12c0agWJKUO1LyLX4xas5FL6 j0sHBQs/7FRtzazRjVekZ5xWudCKAnAnnF3fxT2yGHX2xUmC4HzLUS+rzWguETdz1qJlQz IZ7JA/7YFE7dyuRPEj7IxP85VDKy8MbENtKyRpRvCgo9ICyz04kpIt2LD+llfGlzQyzwpR ehd/pESPLUH56SpR+bPgtPtgcYPbNj61zMzFi5fQJz5ywtAUtPIMr+98oJgRli+H+63TwL UDodgGjgTkqhu7vs0BUwZHa8tKO0WiQpJ2UZMibNa8fSSuLANzKXgs/ItRFQww== 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 4hhXLt4xMXzdWP for ; Sat, 12 Sep 2026 00:28:06 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 46bb6 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Sat, 12 Sep 2026 00:28:06 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Konstantin Belousov Subject: git: 04fcc0f629e5 - stable/15 - rtld i386: use macro for the 'GNU ABI' calling convention of TLS resolver 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: kib X-Git-Repository: src X-Git-Refname: refs/heads/stable/15 X-Git-Reftype: branch X-Git-Commit: 04fcc0f629e569427eaf6900f107dfb235e91e18 Auto-Submitted: auto-generated Date: Sat, 12 Sep 2026 00:28:06 +0000 Message-Id: <6aa49c96.46bb6.1fbfccc8@gitrepo.freebsd.org> The branch stable/15 has been updated by kib: URL: https://cgit.FreeBSD.org/src/commit/?id=04fcc0f629e569427eaf6900f107dfb235e91e18 commit 04fcc0f629e569427eaf6900f107dfb235e91e18 Author: Konstantin Belousov AuthorDate: 2026-08-25 12:31:53 +0000 Commit: Konstantin Belousov CommitDate: 2026-09-11 06:59:53 +0000 rtld i386: use macro for the 'GNU ABI' calling convention of TLS resolver (cherry picked from commit fb63a60d6e15d022dee453363dbaf647cbc2a507) --- libexec/rtld-elf/i386/reloc.c | 3 +-- libexec/rtld-elf/i386/rtld_machdep.h | 5 ++++- 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/libexec/rtld-elf/i386/reloc.c b/libexec/rtld-elf/i386/reloc.c index 845735deac7d..060b3cb147e3 100644 --- a/libexec/rtld-elf/i386/reloc.c +++ b/libexec/rtld-elf/i386/reloc.c @@ -519,8 +519,7 @@ allocate_initial_tls(Obj_Entry *objs) _tcb_set(tls); } -/* GNU ABI */ -__attribute__((__regparm__(1))) void * +__GNU_ABI void * ___tls_get_addr(tls_index *ti) { return (tls_get_addr_common(_tcb_get(), ti->ti_module, ti->ti_offset)); diff --git a/libexec/rtld-elf/i386/rtld_machdep.h b/libexec/rtld-elf/i386/rtld_machdep.h index 7eb7b1cdfb77..574eafe432db 100644 --- a/libexec/rtld-elf/i386/rtld_machdep.h +++ b/libexec/rtld-elf/i386/rtld_machdep.h @@ -78,7 +78,9 @@ typedef struct { unsigned long ti_offset; } tls_index; -void *___tls_get_addr(tls_index *ti) __attribute__((__regparm__(1))) __exported; +#define __GNU_ABI __attribute__((__regparm__(1))) + +void *___tls_get_addr(tls_index *ti) __GNU_ABI __exported; void *__tls_get_addr(tls_index *ti) __exported; #define md_abi_variant_hook(x) @@ -86,4 +88,5 @@ void *__tls_get_addr(tls_index *ti) __exported; size_t calculate_first_tls_offset(size_t size, size_t align, size_t offset); size_t calculate_tls_offset(size_t prev_offset, size_t prev_size, size_t size, size_t align, size_t offset); + #endif