From nobody Thu Dec 09 21:23:37 2021 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 1B9D818D0C7F; Thu, 9 Dec 2021 21:23:38 +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 "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4J96Tj5z9nz3K9W; Thu, 9 Dec 2021 21:23:37 +0000 (UTC) (envelope-from git@FreeBSD.org) 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 ADBFF624F; Thu, 9 Dec 2021 21:23:37 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 1B9LNbJX046923; Thu, 9 Dec 2021 21:23:37 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 1B9LNbR5046922; Thu, 9 Dec 2021 21:23:37 GMT (envelope-from git) Date: Thu, 9 Dec 2021 21:23:37 GMT Message-Id: <202112092123.1B9LNbR5046922@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: John Baldwin Subject: git: 5d8176337e69 - main - libthr: Remove the DTV_OFFSET macro. 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: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: jhb X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 5d8176337e691d3ca3fa7d519bc3eaacf6d9faee Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1639085017; 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=uWuE41vHz1RkHwSnFHjpKnk7Yb46/vqjKZ2iZru3DaY=; b=naIlOMUHIkWjFxi4IvqHomduJTRSOH8H39F/CbYN6S6SDx+DetfaK3YeQSxQvuo+1aaMpR Ua7rL1HGaNGp30PBllekIiRsCQ0o4t8oyGcMFtNEZ887i/dspbgnfPEGUJiHL1ujSrJuDL K043imug0WSIxIUVnL4QdKsCL7GrXoKdhI8+V4MnqzXmY0JUQycyiF+WDO6JWFR5ITJmlw AC7xXvXMK42MgYKgfN0ffsT0JJ6ELhBxptVWthYMe86VxzFp8yQI1rPujvFeMQxkMSfk+p Bgolqyu264tZz1eySYOxHgdxV+SjBKL96h6/7NyjbLxE8byQvqYOUU0tDXjRaA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1639085017; a=rsa-sha256; cv=none; b=eE0uHzJDa7PbDKh9c/tAc4JhbdHF1Fmawg9O0w16jhFnvvfZlqN24A6qjLrq5yqYzlT8OW L3gOnIuQ+8qJC1Mi3MLQsMzVlRSNSx2RB2HfKPxgkObaoLhWgk7tqW3YZEbfeHzxQKO5b6 Ajy/OyafuWvqwXndWaPI6/nIDxRdrBobgAA/11FQAIYUISB6ebY42YmluSYA/uJRK/vLUA b26iphb9WHLkXoKEFhl6k2/5mEumXhrTwasDg0JCumvH+ziKhM5bCGejCZT4zQ9mzrYkx+ o8nB+ASBCZsD7PPxa1OqcsZdtSA2YUW60+dklPNLqr8o4rt+t+CcDmKQ2sz9/A== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by jhb: URL: https://cgit.FreeBSD.org/src/commit/?id=5d8176337e691d3ca3fa7d519bc3eaacf6d9faee commit 5d8176337e691d3ca3fa7d519bc3eaacf6d9faee Author: John Baldwin AuthorDate: 2021-12-09 21:15:38 +0000 Commit: John Baldwin CommitDate: 2021-12-09 21:15:38 +0000 libthr: Remove the DTV_OFFSET macro. This macro is confusing as it is not related to the similarly named TLS_DTV_OFFSET. Instead, replace its one use with the desired expression which is the same on all platforms. Reviewed by: kib, emaste, jrtc27 Sponsored by: The University of Cambridge, Google Inc. Differential Revision: https://reviews.freebsd.org/D33345 --- lib/libthr/arch/aarch64/include/pthread_md.h | 2 -- lib/libthr/arch/amd64/include/pthread_md.h | 2 -- lib/libthr/arch/arm/include/pthread_md.h | 2 -- lib/libthr/arch/i386/include/pthread_md.h | 2 -- lib/libthr/arch/mips/include/pthread_md.h | 2 -- lib/libthr/arch/powerpc/include/pthread_md.h | 2 -- lib/libthr/arch/riscv/include/pthread_md.h | 2 -- lib/libthr/thread/thr_symbols.c | 2 +- 8 files changed, 1 insertion(+), 15 deletions(-) diff --git a/lib/libthr/arch/aarch64/include/pthread_md.h b/lib/libthr/arch/aarch64/include/pthread_md.h index d14bce244f8f..3209a2cbe7e2 100644 --- a/lib/libthr/arch/aarch64/include/pthread_md.h +++ b/lib/libthr/arch/aarch64/include/pthread_md.h @@ -38,10 +38,8 @@ #include #include -#include #define CPU_SPINWAIT -#define DTV_OFFSET offsetof(struct tcb, tcb_dtv) /* * Variant I tcb. The structure layout is fixed, don't blindly diff --git a/lib/libthr/arch/amd64/include/pthread_md.h b/lib/libthr/arch/amd64/include/pthread_md.h index 1d393d9cbbed..b3367e85ee65 100644 --- a/lib/libthr/arch/amd64/include/pthread_md.h +++ b/lib/libthr/arch/amd64/include/pthread_md.h @@ -41,8 +41,6 @@ #define CPU_SPINWAIT __asm __volatile("pause") -#define DTV_OFFSET offsetof(struct tcb, tcb_dtv) - /* * Variant II tcb, first two members are required by rtld, * %fs points to the structure. diff --git a/lib/libthr/arch/arm/include/pthread_md.h b/lib/libthr/arch/arm/include/pthread_md.h index 6f99eb7a139b..837b38e70ac5 100644 --- a/lib/libthr/arch/arm/include/pthread_md.h +++ b/lib/libthr/arch/arm/include/pthread_md.h @@ -36,10 +36,8 @@ #include #include -#include #define CPU_SPINWAIT -#define DTV_OFFSET offsetof(struct tcb, tcb_dtv) /* * Variant I tcb. The structure layout is fixed, don't blindly diff --git a/lib/libthr/arch/i386/include/pthread_md.h b/lib/libthr/arch/i386/include/pthread_md.h index 7de8aa56203e..48374480d207 100644 --- a/lib/libthr/arch/i386/include/pthread_md.h +++ b/lib/libthr/arch/i386/include/pthread_md.h @@ -41,8 +41,6 @@ #define CPU_SPINWAIT __asm __volatile("pause") -#define DTV_OFFSET offsetof(struct tcb, tcb_dtv) - /* * Variant II tcb, first two members are required by rtld, * %gs points to the structure. diff --git a/lib/libthr/arch/mips/include/pthread_md.h b/lib/libthr/arch/mips/include/pthread_md.h index 20b0e7065595..2a29e6717abe 100644 --- a/lib/libthr/arch/mips/include/pthread_md.h +++ b/lib/libthr/arch/mips/include/pthread_md.h @@ -38,10 +38,8 @@ #include #include #include -#include #define CPU_SPINWAIT -#define DTV_OFFSET offsetof(struct tcb, tcb_dtv) /* * Variant I tcb. The structure layout is fixed, don't blindly diff --git a/lib/libthr/arch/powerpc/include/pthread_md.h b/lib/libthr/arch/powerpc/include/pthread_md.h index 0ed44058a7a7..3fcf8c3245da 100644 --- a/lib/libthr/arch/powerpc/include/pthread_md.h +++ b/lib/libthr/arch/powerpc/include/pthread_md.h @@ -35,12 +35,10 @@ #ifndef _PTHREAD_MD_H_ #define _PTHREAD_MD_H_ -#include #include #define CPU_SPINWAIT -#define DTV_OFFSET offsetof(struct tcb, tcb_dtv) #ifdef __powerpc64__ #define TP_OFFSET 0x7010 #else diff --git a/lib/libthr/arch/riscv/include/pthread_md.h b/lib/libthr/arch/riscv/include/pthread_md.h index 55d9b7260fd2..1cdc8a12be95 100644 --- a/lib/libthr/arch/riscv/include/pthread_md.h +++ b/lib/libthr/arch/riscv/include/pthread_md.h @@ -42,10 +42,8 @@ #define _PTHREAD_MD_H_ #include -#include #define CPU_SPINWAIT -#define DTV_OFFSET offsetof(struct tcb, tcb_dtv) #define TP_OFFSET sizeof(struct tcb) /* diff --git a/lib/libthr/thread/thr_symbols.c b/lib/libthr/thread/thr_symbols.c index cee263c56826..71737392c62f 100644 --- a/lib/libthr/thread/thr_symbols.c +++ b/lib/libthr/thread/thr_symbols.c @@ -55,7 +55,7 @@ int _thread_size_key = sizeof(struct pthread_key); int _thread_off_key_allocated = offsetof(struct pthread_key, allocated); int _thread_off_key_destructor = offsetof(struct pthread_key, destructor); int _thread_max_keys = PTHREAD_KEYS_MAX; -int _thread_off_dtv = DTV_OFFSET; +int _thread_off_dtv = offsetof(struct tcb, tcb_dtv); int _thread_off_state = offsetof(struct pthread, state); int _thread_state_running = PS_RUNNING; int _thread_state_zoombie = PS_DEAD;