From nobody Sat Sep 05 22:00:39 2026 X-Original-To: dev-commits-src-all@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 4hcnMW6s8rz6rCS2 for ; Sat, 05 Sep 2026 22:00:39 +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 4hcnMW3PvLz3xZ9 for ; Sat, 05 Sep 2026 22:00:39 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1788645639; 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=lln42+X0Ukw0AAKanSqft4OsMMO328gCSmTOfiQqcLQ=; b=WYjGWRZ3gZf+HzP6qMxrOu6KWYqKebPfAVz8bgjLpCdcqR83GzcWTNaLSs4MkovIqrY3Az Y3Fs63w6SKJdIyrurmTt90AmnoBI2pmEUxwuyMR3pp7IC01G6pwWr3jz98j01Y+qdf4XtY 4GZ2gySIVihPjRIaqg/v85nn4xX7AD2Y5caK+/6efdx4IOAcLCdOl9ff4CWYKfsrtTtdZi 2QERlz8TdBUuYARns4jyg/QdAPIIXEbHkRpsH4NP5kS6zMUdNMgtP47ZE4TpD84FtXofYX bCbilKVvg5apOyTGBEI1vE0RSePW2kReZxyrfphNmAgv/l2x8q+kaqEcYozmnA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1788645639; a=rsa-sha256; cv=none; b=Kikno/ifqv0zIHqjEDPVs/0KLAtAzKvgNbM7h1EsIM43/xtekLWfRpUlz45J8k5J+uWULy JdAUkLJ9WYo6ZHSVQa4SEKOvq8RWfFdXVdEpot5djtPFv5aPVx0oRRp3xkZVNwEP8CNTwo eNUd4ZG9UroZZuMWsR9mT0+hzAdkEOATAdXft40ZWl2SGZk6JMGjV1EAmEzeQALXOo6yJB TMbzyg+6RJQjUDZZPZW7dCjBSJQx4CXc6cUlExWvXyORArATjXO3mO6v2TlMiRJ8+Dv99x weV7J9Jy1VkmrQDrXYyR++iCiiwfocO3LXc34e6FXas4GMQ1jtOSTcC1rUGMlQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1788645639; 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=lln42+X0Ukw0AAKanSqft4OsMMO328gCSmTOfiQqcLQ=; b=e8jZ5OVeQoE6k/6siuckQIJ2O/nh0MLxkCWc0iaCZxM9e/a3840nJ5sVsJCoC8BOB4G8BZ XfjRS0W3aJIRsGPJ4tysYupxNFjRRMTl5wJfWvJYhYMuMfYPzHyjpplLiJsXRzkJRpBxkT IsYqDEH5hWpMktFQDvNnGVzjiduLK8ZY7WFOWoNsyueqV95CbqfFlfke/TccEaecSVpdRM H9Xpcb0dg+WPzDjY8zgyNMSAe5paGqbP0oQZVubc1PVbDYEVZsobNjVIfnwe5akS4vh3fF q8qxh2H86UoxbXU0xiC5uFq71s4Lb9On9/5zHpwSqBb7fLK+KhrPUAYi++8F5Q== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4hcnMW1dHMz13Gg for ; Sat, 05 Sep 2026 22:00:39 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 3f0f3 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Sat, 05 Sep 2026 22:00:39 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Konstantin Belousov Subject: git: fb63a60d6e15 - main - rtld i386: use macro for the 'GNU ABI' calling convention of TLS resolver List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@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/main X-Git-Reftype: branch X-Git-Commit: fb63a60d6e15d022dee453363dbaf647cbc2a507 Auto-Submitted: auto-generated Date: Sat, 05 Sep 2026 22:00:39 +0000 Message-Id: <6a9c9107.3f0f3.6d983356@gitrepo.freebsd.org> The branch main has been updated by kib: URL: https://cgit.FreeBSD.org/src/commit/?id=fb63a60d6e15d022dee453363dbaf647cbc2a507 commit fb63a60d6e15d022dee453363dbaf647cbc2a507 Author: Konstantin Belousov AuthorDate: 2026-08-25 12:31:53 +0000 Commit: Konstantin Belousov CommitDate: 2026-09-05 22:00:09 +0000 rtld i386: use macro for the 'GNU ABI' calling convention of TLS resolver Discussed with: jrtc27 Sponsored by: The FreeBSD Foundation MFC after: 1 week Differential revision: https://reviews.freebsd.org/D59269 --- 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