From owner-dev-commits-src-main@freebsd.org Wed Mar 10 19:25:01 2021 Return-Path: Delivered-To: dev-commits-src-main@mailman.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.nyi.freebsd.org (Postfix) with ESMTP id ECD4E574CF0; Wed, 10 Mar 2021 19:25:01 +0000 (UTC) (envelope-from jhb@FreeBSD.org) Received: from smtp.freebsd.org (smtp.freebsd.org [IPv6:2610:1c1:1:606c::24b:4]) (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 "smtp.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4DwhqK5HWbz4YgM; Wed, 10 Mar 2021 19:25:01 +0000 (UTC) (envelope-from jhb@FreeBSD.org) Received: from John-Baldwins-MacBook-Pro.local (ralph.baldwin.cx [66.234.199.215]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (Client did not present a certificate) (Authenticated sender: jhb) by smtp.freebsd.org (Postfix) with ESMTPSA id 2371549CE; Wed, 10 Mar 2021 19:25:01 +0000 (UTC) (envelope-from jhb@FreeBSD.org) To: Jessica Clarke , Olivier Houchard Cc: "src-committers@freebsd.org" , "dev-commits-src-all@freebsd.org" , "dev-commits-src-main@freebsd.org" References: <202103101807.12AI7IVW089870@gitrepo.freebsd.org> <28B50FA6-65E4-4A5A-8339-8A4A8720974B@freebsd.org> From: John Baldwin Subject: Re: git: c328f64d8107 - main - arm64: Fix COMPAT_FREEBSD32. Message-ID: <4e2cf000-991c-c09a-8c23-43ad4f5ef715@FreeBSD.org> Date: Wed, 10 Mar 2021 11:25:00 -0800 User-Agent: Mozilla/5.0 (Macintosh; Intel Mac OS X 10.14; rv:78.0) Gecko/20100101 Thunderbird/78.7.1 MIME-Version: 1.0 In-Reply-To: <28B50FA6-65E4-4A5A-8339-8A4A8720974B@freebsd.org> Content-Type: text/plain; charset=utf-8; format=flowed Content-Language: en-US Content-Transfer-Encoding: 8bit X-BeenThere: dev-commits-src-main@freebsd.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: Commit messages for the main branch of the src repository List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 10 Mar 2021 19:25:02 -0000 On 3/10/21 10:36 AM, Jessica Clarke wrote: > On 10 Mar 2021, at 18:07, Olivier Houchard wrote: >> >> The branch main has been updated by cognet: >> >> URL: https://cgit.FreeBSD.org/src/commit/?id=c328f64d81079bad5064c8a387883df50ab5aaed >> >> commit c328f64d81079bad5064c8a387883df50ab5aaed >> Author: Olivier Houchard >> AuthorDate: 2021-03-10 18:01:41 +0000 >> Commit: Olivier Houchard >> CommitDate: 2021-03-10 18:06:42 +0000 >> >> arm64: Fix COMPAT_FREEBSD32. >> >> The ENTRY() macro was modified by commit >> 28d945204ea1014d7de6906af8470ed8b3311335 to add an optional NOP instruction >> at the beginning of the function. It is of course an arm64 instruction, so >> unsuitable for the 32bits sigcode. So just use EENTRY() instead for >> aarch32_sigcode. This should fix receiving signals when running 32bits >> binaries on FreeBSD/arm64. > > Hmm, that's a good point, does the extra nop for the AArch64 sigcode > cause issues for gdb detecting it? I think GDB might be ok because the nop comes first as it looks for the sequence of instructions after the nop to identify the signal frame (it doesn't care what instructions come before the sequence). -- John Baldwin