From nobody Thu Feb 2 14:59:05 2023 X-Original-To: dev-commits-src-main@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 4P724B4PXvz3fkgZ; Thu, 2 Feb 2023 14:59:06 +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 4P724B1qrwz3FH3; Thu, 2 Feb 2023 14:59:06 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1675349946; 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=aFAnT17RSM0SIRsC+7JA+9Ho0akZ84647ZeSEh3kp8Y=; b=gtCfo8wBBugmtAVIhndm5F665IQa3mvi5TRKU89FjZVSXxywkPQDz+wrHkpUQcyeGPWM7F RICLKRJlwtHlJTFVLjGb+qGQZTkO+/LSX0h/cwQNJMrgsagRkfJMlalIcnqQgMUcWDfVrx Uo2L6C9dgH1LR0JOrhV6ZttuYcfJ5rJ7mo7FFZPDKea+c/ZruITdspV8S4D+HFO6mGQKJX ll20zNOwQd/A4sUtzhvjNg4OaC5HPsJ6npXx/9yNtUd018iMQ3l01VSwQnsTvOaO45WoaR T19SmbRjTJXPjjuzjllwTaRUq5mOGTEArarEoTrfc9jZlQsbuoAzj9s6ZpP/ZA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1675349946; 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=aFAnT17RSM0SIRsC+7JA+9Ho0akZ84647ZeSEh3kp8Y=; b=RvEOLKjAcEz334bYtcLRC/Y3CbqecWmUezALBFSnUTlaSufok8Z660xofmTXwQ70zvBdlQ j+AX379pMcv7vn5AnUucaXppZ5C8GJ0Q9m1eL8s/aTVr6D7T3tcmQL2r6p5n/vGXuvl1NK tOuPfrd/8wA5OBP7nY4Qqu6P7L3fBUYU1yY/uennOpvmrEl3dwM2hIr0FrPjOlL4kzg8mH 2udtGDOdHlAkUEiFEVH6IHXulWJKNun6Sic8LMz7MJNWdYKdC2XAjbD6En7eH2iSvdNfzu DqwlyUbDMcu9KUfCZ5DX9oW3yApzkO6EOp6ZiC7bAfR3Je+GX6sigmpBE+IgAw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1675349946; a=rsa-sha256; cv=none; b=CnFm5Gf5JXLED9vPkmcMKQd0g6iUyWrnxQcEQYTNMFU0j+SJvCIXdlZSr+Bd2lb8sRve6M IDYg2H51yDVPTDyzHQGE6Cg17e//ZjHOM+JZRxjGhatUj72hRv0fQEBsO4hbGeAJpDlx+h KFrlbopFk52gS36jr+Z5Pbrkx33AgUrwVvyBKKql9zFfiosqlnLjP4moT1BOtjCv7uaXUD YKAvjU2b3kq6EqDMniBYp4eVDkzCY4wCabSs9mk2iwlEPqlYF9nzOoNzOrCZ32RPvcUBYC fTxuaK4QtS09aXeWi/huI0+efknsTf6SfPuHOAyH3xL6XpSfErv/T0h7cvha9A== 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 4P724B0P1nzyQ9; Thu, 2 Feb 2023 14:59:06 +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 312Ex586092061; Thu, 2 Feb 2023 14:59:05 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 312Ex5sW092060; Thu, 2 Feb 2023 14:59:05 GMT (envelope-from git) Date: Thu, 2 Feb 2023 14:59:05 GMT Message-Id: <202302021459.312Ex5sW092060@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Dmitry Chagin Subject: git: 6f8439db241c - main - linux(4): Use COMPAT_LINUX32 enstead of __ELF_WORD_SIZE. List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-main@freebsd.org X-BeenThere: dev-commits-src-main@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: dchagin X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 6f8439db241c7409275d77f5376e8505967bef67 Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by dchagin: URL: https://cgit.FreeBSD.org/src/commit/?id=6f8439db241c7409275d77f5376e8505967bef67 commit 6f8439db241c7409275d77f5376e8505967bef67 Author: Dmitry Chagin AuthorDate: 2023-02-02 14:58:06 +0000 Commit: Dmitry Chagin CommitDate: 2023-02-02 14:58:06 +0000 linux(4): Use COMPAT_LINUX32 enstead of __ELF_WORD_SIZE. COMPAT_LINUX32 option is defined for case when building 32-bit Linuxulator for the 64-bit host. Usage of __ELF_WORD_SIZE is wrong here as it is equal to 32 on i386 too. MFC after: 1 week --- sys/compat/linux/linux_elf.c | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/sys/compat/linux/linux_elf.c b/sys/compat/linux/linux_elf.c index e73dbdae888e..1da919f02a81 100644 --- a/sys/compat/linux/linux_elf.c +++ b/sys/compat/linux/linux_elf.c @@ -53,7 +53,7 @@ __FBSDID("$FreeBSD$"); #include -#if __ELF_WORD_SIZE == 32 +#ifdef COMPAT_LINUX32 #define linux_pt_regset linux_pt_regset32 #define bsd_to_linux_regset bsd_to_linux_regset32 #include @@ -135,7 +135,7 @@ __linuxN(prepare_notes)(struct thread *td, struct note_info_list *list, } typedef struct linux_elf_prstatus linux_elf_prstatus_t; -#if __ELF_WORD_SIZE == 32 +#ifdef COMPAT_LINUX32 typedef struct prpsinfo32 linux_elf_prpsinfo_t; typedef struct fpreg32 linux_elf_prfpregset_t; #else @@ -212,7 +212,7 @@ __linuxN(note_prstatus)(void *arg, struct sbuf *sb, size_t *sizep) { struct thread *td; linux_elf_prstatus_t *status; -#if __ELF_WORD_SIZE == 32 +#ifdef COMPAT_LINUX32 struct reg32 pr_reg; #else struct reg pr_reg; @@ -229,7 +229,7 @@ __linuxN(note_prstatus)(void *arg, struct sbuf *sb, size_t *sizep) status->pr_cursig = td->td_proc->p_sig; status->pr_pid = td->td_tid; -#if __ELF_WORD_SIZE == 32 +#ifdef COMPAT_LINUX32 fill_regs32(td, &pr_reg); #else fill_regs(td, &pr_reg); @@ -251,7 +251,7 @@ __linuxN(note_fpregset)(void *arg, struct sbuf *sb, size_t *sizep) if (sb != NULL) { KASSERT(*sizep == sizeof(*fpregset), ("invalid size")); fpregset = malloc(sizeof(*fpregset), M_TEMP, M_ZERO | M_WAITOK); -#if __ELF_WORD_SIZE == 32 +#ifdef COMPAT_LINUX32 fill_fpregs32(td, fpregset); #else fill_fpregs(td, fpregset);