From nobody Thu Feb 09 07:56:42 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 4PC8MZ3nKsz3myJP; Thu, 9 Feb 2023 07:56:42 +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 4PC8MZ2mktz44jf; Thu, 9 Feb 2023 07:56:42 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1675929402; 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=lRTmPVd/TffbxWJ1PEF6jz8070WFwzWGG6tMMQ3YlfE=; b=a6Wq5aq9+wx1mw8qDwqNbQgrcoFhXJXDo1B2aoCfIHVHT7IaNYiqZHGSheIrO6adaANjZx Gu8YCLOa2im2ccwnhHZolcsfjhNxtyYuI+BSSHvrlXYgCR1b0aeiHC5XH+7SvtO9p7+Khm 1JdsxB+xhQ0xRYbm+P1MbmvQcq/m8GkzABPeSTmhCEjXIVo1dH3/dPSMXCiGRVi/wBtATq YWe642b88zLyOjCqkKJ4Kxt9klKzIHUxjUtjVEFKNMy0hIKouqEQRt4vE+yOhxrWvd1Uzv BR/5miYjkyfO9vx9wbWnjI/payqcHc3zsdWr/RxlWSJwNbPLLwxK+5JfU4+jwQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1675929402; 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=lRTmPVd/TffbxWJ1PEF6jz8070WFwzWGG6tMMQ3YlfE=; b=jdUa9gopsBTZryHu7mMo9Laxfli09UXxyooE09wDtgw8yjNe8557WsYRtTwjqTtgznhSno nrtDng0TEZ1q7tT6OdfvvJuJl+AGZnYUmHNqK2piZL7JzN32VxJR7HSLeMSLs4I+s68HMm 9CAfRmEC9idC91cdTrRlghpTtVqel9rYUlY7Ha1lyxeqxGIn1i8oMr2ASDNVFlK2jUfYhf bQjX9wjjbGTVHSPMiACQN/c5WXheMZp93mWT54wTU1DL3GyKHof4IZjcyamC7s0ExR75Qg Z+Nf+fLvCH3plTzvHixY/WsCOd3xIRv+Kn85gEVZExi1Mbq6hTLQK3bfngjogA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1675929402; a=rsa-sha256; cv=none; b=hcyFqm4dfqIXhlHRuRv/oIQVbIA0yTS1XMYmBlgOObd2nvDu9B3l6RmxXmolfBNA1z+lGh 6vLR06rKiRTgulWR3Y5u0gNaBdb4xqiA+y3AMdg2fBxZxobci8+E5GeiydXX11CIGCcIvW aGxF3HLOjsPnlyN0y7hdWFTmB4z2Fkvdm1De92VVYOvsAF5j49a4P6dbfvVm8+nmIvq5o4 ONwMavxrKG4PIq+LIxXL9g/yC73I3wHZqkUnX1GNro47KGCDhZyH2umCSTmglm5lfA6tkf re2Uoq67JUWohHBhr5bCkwO3NrEKCaf1ppuczcCOOS8geAM/jDuJJ1MkgPVMvA== 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 4PC8MZ1sTbzVG1; Thu, 9 Feb 2023 07:56:42 +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 3197ugDc092869; Thu, 9 Feb 2023 07:56:42 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 3197ugD2092868; Thu, 9 Feb 2023 07:56:42 GMT (envelope-from git) Date: Thu, 9 Feb 2023 07:56:42 GMT Message-Id: <202302090756.3197ugD2092868@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Dmitry Chagin Subject: git: cc79fd889da4 - stable/13 - linux(4): Use COMPAT_LINUX32 enstead of __ELF_WORD_SIZE. 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: dchagin X-Git-Repository: src X-Git-Refname: refs/heads/stable/13 X-Git-Reftype: branch X-Git-Commit: cc79fd889da4466a29aa77893a64d64a95ec60b3 Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch stable/13 has been updated by dchagin: URL: https://cgit.FreeBSD.org/src/commit/?id=cc79fd889da4466a29aa77893a64d64a95ec60b3 commit cc79fd889da4466a29aa77893a64d64a95ec60b3 Author: Dmitry Chagin AuthorDate: 2023-02-02 14:58:06 +0000 Commit: Dmitry Chagin CommitDate: 2023-02-09 07:54:16 +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 (cherry picked from commit 6f8439db241c7409275d77f5376e8505967bef67) --- 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);