From patchwork Sat Jan 11 22:48:33 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Samuel Thibault X-Patchwork-Id: 104592 Return-Path: X-Original-To: patchwork@sourceware.org Delivered-To: patchwork@sourceware.org Received: from server2.sourceware.org (localhost [IPv6:::1]) by sourceware.org (Postfix) with ESMTP id 1F1473858406 for ; Sat, 11 Jan 2025 22:49:13 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org 1F1473858406 X-Original-To: libc-alpha@sourceware.org Delivered-To: libc-alpha@sourceware.org Received: from sonata.ens-lyon.org (domu-toccata.ens-lyon.fr [140.77.166.138]) by sourceware.org (Postfix) with ESMTPS id 7F1803858D3C for ; Sat, 11 Jan 2025 22:48:36 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.2 sourceware.org 7F1803858D3C Authentication-Results: sourceware.org; dmarc=none (p=none dis=none) header.from=ens-lyon.org Authentication-Results: sourceware.org; spf=pass smtp.mailfrom=bounce.ens-lyon.org ARC-Filter: OpenARC Filter v1.0.0 sourceware.org 7F1803858D3C Authentication-Results: server2.sourceware.org; arc=none smtp.remote-ip=140.77.166.138 ARC-Seal: i=1; a=rsa-sha256; d=sourceware.org; s=key; t=1736635716; cv=none; b=EqF3hUo5/4fHn5VNxjsQGT0BWPmY2R3wrErQ2QLZo5aEpPo+/hB2WxEVw1A/huq67db3+oeDVule8oubLRzo+lIsXKjLeO1xetj+5apNwfEwYxQvGwdVHtYJQow7V+1wFl3NLarcjsjpF7dO4gBszlZeI0cVKRa7h2Fj/dQx1ss= ARC-Message-Signature: i=1; a=rsa-sha256; d=sourceware.org; s=key; t=1736635716; c=relaxed/simple; bh=o+Gl5/xRtO7q9WtM/WNZdEnzn5jupikYKncsiuqnRyQ=; h=From:To:Subject:Date:Message-ID:MIME-Version; b=PKkmxJTu/hvCqyFHFW7bhnu9yJVceKxZPsrq5Y1w/bAYR1n5RbUiUayobxPJhV00Xaq8SBygwSXDnTsRCG3ScUaPQ0GzCKvYTp7mvrJBNTbI1Hkz0jvk5C3eZ1TCJNXAy0CtY5lJuZ5Vzw4MVZvQv7p0ftgkSYxoPzYftLzskaU= ARC-Authentication-Results: i=1; server2.sourceware.org DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org 7F1803858D3C Received: from localhost (localhost [127.0.0.1]) by sonata.ens-lyon.org (Postfix) with ESMTP id 57C9DA03B1; Sat, 11 Jan 2025 23:48:35 +0100 (CET) Received: from sonata.ens-lyon.org ([127.0.0.1]) by localhost (sonata.ens-lyon.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id Wj-2VD28_lVp; Sat, 11 Jan 2025 23:48:35 +0100 (CET) Received: from begin (aamiens-653-1-40-48.w83-192.abo.wanadoo.fr [83.192.199.48]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange ECDHE (P-256) server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by sonata.ens-lyon.org (Postfix) with ESMTPSA id C54C7A038E; Sat, 11 Jan 2025 23:48:34 +0100 (CET) Received: from samy by begin with local (Exim 4.98) (envelope-from ) id 1tWkHS-000000070Rf-1Gkf; Sat, 11 Jan 2025 23:48:34 +0100 From: Samuel Thibault To: libc-alpha@sourceware.org, Florian Weimer Cc: Samuel Thibault , commit-hurd@gnu.org Subject: [PATCH] elf: make tst-tls_tp_offset compare &thread_var to THREAD_SELF Date: Sat, 11 Jan 2025 23:48:33 +0100 Message-ID: <20250111224833.1670000-1-samuel.thibault@ens-lyon.org> X-Mailer: git-send-email 2.45.2 MIME-Version: 1.0 X-Spam-Status: No, score=-13.1 required=5.0 tests=BAYES_00, GIT_PATCH_0, JMQ_SPF_NEUTRAL, KAM_DMARC_STATUS, SPF_HELO_PASS, SPF_PASS, TXREP autolearn=ham autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on server2.sourceware.org X-BeenThere: libc-alpha@sourceware.org X-Mailman-Version: 2.1.30 Precedence: list List-Id: Libc-alpha mailing list List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: libc-alpha-bounces~patchwork=sourceware.org@sourceware.org rather than pthread_self (), which in htl is not a pointer into dtv, but an index. Reviewed-by: Florian Weimer --- elf/tst-tls_tp_offset.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/elf/tst-tls_tp_offset.c b/elf/tst-tls_tp_offset.c index e7c50663aa..a8faebc0eb 100644 --- a/elf/tst-tls_tp_offset.c +++ b/elf/tst-tls_tp_offset.c @@ -37,7 +37,7 @@ do_test (void) ptrdiff_t block_offset = ((struct link_map *) _r_debug.r_map)->l_tls_offset; printf ("main program TLS block offset: %td\n", block_offset); - if ((uintptr_t) &thread_var < (uintptr_t) pthread_self ()) + if ((uintptr_t) &thread_var < (uintptr_t) THREAD_SELF) { puts("TLS variables are located before struct pthread."); TEST_COMPARE (((intptr_t) __thread_pointer () - block_offset)