From nobody Thu Oct 26 20:39:15 2023 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 4SGd1w1ng2z4yFyP; Thu, 26 Oct 2023 20:39:16 +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 4SGd1w1P5lz3TCw; Thu, 26 Oct 2023 20:39:16 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1698352756; 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=xDIGF93MN3WVTYdi+FPyCRBbvW8lGLkvswlgp1YD6AU=; b=A+DFAIZutfm+tRX3durvNBLLtvRXPc6dNPi1nEUua4MqVqAb6bsWiD3/hRCPX0zQ0WX8tE Y5V/pSXpUagpfDHfjRDAbZafyJEtuYP6kBo2J+Yvk5rwxxH3LqpuPsjmRqRM5/SRCz8hzl S12VmvbJeExKfuYTGg6U9lvVQg13az0DH+dBsTVG90WrnZ6GZa0+gVY6zeZ/LxzcyL8GJp b0DBXyO4Fpttt/D9oW3KAd+pByuOeRimu7aH+qGD4Mme3hs1dF09MtD7I4mm52PVstzRRK glNfZKqbdMH+0epj9N8zwG9VDO+3I3HAx7oSEEpcS3UxkdRdttHRd2gIkV05gw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1698352756; 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=xDIGF93MN3WVTYdi+FPyCRBbvW8lGLkvswlgp1YD6AU=; b=Qp8LnrGRvdh6lbjrhtm5Ccha2v9Nh7YtZWmi7jzkube1YLNu1rYfOXQuiFzYW7wlBLN1eR isOD5pKR5s6eLQvUTUkt0HI8WdlWusIPU1ZdnZX7NEWgj321c4vYWQsBXhPlw0qe9Jeqrf EnWL7zVugye0toNi62+Jqoizs4B1jTIMkSLsmud1s4DF7edAERjJgP/n0c2gc1fT/Ggc+q g8rTTW62BKuYpplMIfRtfVTtc/QG9DcZ/huO2WqH1BJESj8j1/3L8nuury9i2Inuhu+AiH Rn+VtZZPDZcJ7pRxlG+uRhnNB0VMykSP44E1+Iz3Dj4CqtnOsgPwooU9NgkJZQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1698352756; a=rsa-sha256; cv=none; b=UdmmaKiD4mPKlQRoYqhji/pqtTcre4hysVNQl1gmA193TsmzmG/4iy7szlrg2ascNkbVsL CftWlq5Tm1LaHiLsCDHW/vZCAAgBDOEorrsFBwSHoL8BG3hGj8mUpIVAQkWkENTlsxYfSg nEtbvlgMMFfsIs9Tw7SYn7HVCxVcLI+2PTK+JBo/mDGIwZOBxtYgBU/V8c4b1H4BOlTGdC sHy5smHjnQgCJGbs+n8hchdSal/jwUrY5BnY9v4yfrYtGxRyOBf1zXibyJjRUd52wkojbb KHFjCXfvri1j4Zd9GZl7CCFl191bak12wMmG5BRaNljbjEoNx9xZH7/RN1jRfw== 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 4SGd1w0NBBzlsd; Thu, 26 Oct 2023 20:39:16 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 39QKdFd4091642; Thu, 26 Oct 2023 20:39:15 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 39QKdFml091639; Thu, 26 Oct 2023 20:39:15 GMT (envelope-from git) Date: Thu, 26 Oct 2023 20:39:15 GMT Message-Id: <202310262039.39QKdFml091639@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Brooks Davis Subject: git: 302ff7e6aff0 - stable/13 - libprocstat: improve conditional for 32-bit compat 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: brooks X-Git-Repository: src X-Git-Refname: refs/heads/stable/13 X-Git-Reftype: branch X-Git-Commit: 302ff7e6aff0da1ea3b4de79940aac8103e4bb9c Auto-Submitted: auto-generated The branch stable/13 has been updated by brooks: URL: https://cgit.FreeBSD.org/src/commit/?id=302ff7e6aff0da1ea3b4de79940aac8103e4bb9c commit 302ff7e6aff0da1ea3b4de79940aac8103e4bb9c Author: Brooks Davis AuthorDate: 2023-10-26 20:38:41 +0000 Commit: Brooks Davis CommitDate: 2023-10-26 20:38:41 +0000 libprocstat: improve conditional for 32-bit compat Include support for translating 32-bit auxv vectors on non-64-bit platforms that aren't riscv (which has no 32-bit ABI support and probably never will). Reviewed by: markj Sponsored by: DARPA Differential Revision: https://reviews.freebsd.org/D42201 (cherry picked from commit 248fe3d3483cb3ec2c78dd31dc02a467060a6577) --- lib/libprocstat/libprocstat.c | 6 +++--- lib/libprocstat/libprocstat.h | 5 +++++ 2 files changed, 8 insertions(+), 3 deletions(-) diff --git a/lib/libprocstat/libprocstat.c b/lib/libprocstat/libprocstat.c index f0542587cbdb..936bf867328a 100644 --- a/lib/libprocstat/libprocstat.c +++ b/lib/libprocstat/libprocstat.c @@ -2384,7 +2384,7 @@ procstat_getosrel(struct procstat *procstat, struct kinfo_proc *kp, int *osrelp) #define PROC_AUXV_MAX 256 -#if __ELF_WORD_SIZE == 64 +#ifdef PS_ARCH_HAS_FREEBSD32 static const char *elf32_sv_names[] = { "Linux ELF32", "FreeBSD ELF32", @@ -2467,7 +2467,7 @@ out: free(auxv32); return (auxv); } -#endif /* __ELF_WORD_SIZE == 64 */ +#endif /* PS_ARCH_HAS_FREEBSD32 */ static Elf_Auxinfo * procstat_getauxv_sysctl(pid_t pid, unsigned int *cntp) @@ -2476,7 +2476,7 @@ procstat_getauxv_sysctl(pid_t pid, unsigned int *cntp) int name[4]; size_t len; -#if __ELF_WORD_SIZE == 64 +#ifdef PS_ARCH_HAS_FREEBSD32 if (is_elf32_sysctl(pid)) return (procstat_getauxv32_sysctl(pid, cntp)); #endif diff --git a/lib/libprocstat/libprocstat.h b/lib/libprocstat/libprocstat.h index 0df01817663e..3d30b4db4018 100644 --- a/lib/libprocstat/libprocstat.h +++ b/lib/libprocstat/libprocstat.h @@ -102,6 +102,11 @@ #define PS_FST_FFLAG_EXEC 0x2000 #define PS_FST_FFLAG_HASLOCK 0x4000 +#if !defined(__ILP32__) && !defined(__riscv) +/* Target architecture supports 32-bit compat */ +#define PS_ARCH_HAS_FREEBSD32 1 +#endif + struct kinfo_kstack; struct kinfo_proc; struct kinfo_vmentry;