From nobody Mon Jan 10 11:32:57 2022 X-Original-To: dev-commits-src-branches@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 8E94D1932906; Mon, 10 Jan 2022 11:32:58 +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 4JXWsP4rFHz4TSG; Mon, 10 Jan 2022 11:32:57 +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 6AB482455C; Mon, 10 Jan 2022 11:32:57 +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 20ABWvLP038905; Mon, 10 Jan 2022 11:32:57 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 20ABWvpC038904; Mon, 10 Jan 2022 11:32:57 GMT (envelope-from git) Date: Mon, 10 Jan 2022 11:32:57 GMT Message-Id: <202201101132.20ABWvpC038904@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Andrew Turner Subject: git: 6d91006cd1b5 - stable/13 - arm64: Fix COMPAT_FREEBSD32. List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-branches@freebsd.org X-BeenThere: dev-commits-src-branches@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: andrew X-Git-Repository: src X-Git-Refname: refs/heads/stable/13 X-Git-Reftype: branch X-Git-Commit: 6d91006cd1b51409b0c56813e8bacca5c6ece632 Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1641814378; 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=r43hjb8XVyl0Rmb3vB+pPPajmpWSaaDGbrZ8ysP/QWw=; b=xIfOJI+p1FArJyclV+SYLU6ExSr8iuyrCxHK8g7mtSi42I1nxOBtyPJvTN2PfggjpIZP+f hUfTnoOwxE9Qz5H+RpwtY9ADDGX267F6nCCrh0eIyiHegrsm2CZ4DBYSG0pd++CVDhx6TJ mJm44zJt4rVehPxfYma6vaNZwkREZd0VNYIdnO9kUWmQ2Gj4dyKs3ZoX6dwz9dFNhLaTLn Pa4yJOn2Pk+b32qOocQF/C1gRfegacpl9xVS9ZC8Bs8QNHXUPRzpfXujLhUf90v+bCTNA+ 8Ucv6MiElDvXEaxQoJN0T7xBHMfB4wRu/GnMrRk9rZt1nxZClMTJtKucTmEGcg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1641814378; a=rsa-sha256; cv=none; b=ZvzyPFIMq/9EZyNx/5mvPAp4lBOMTKU0xO+uCeLlgmtzXfttXqdxjsa4AkaQW3ZwihGXJt qH68JDIZfZpONeAvSSgi5k0Q5JjS2Gvtat9q8aIwhAuqEE2VgezZdtsZt5iZKbT2WW/9Jq TJA+aGTgnK5qCAWfVtD+2Qq91IpXp+MuGi7KXRlQ3Xl8H1eYk4NDUhF9j3VOtr2NDM3a3K jNiiHpQIIYXXmNgGHVnkvHFi2eru9Ry5sjOqSf6wTQ495gZlec3ryc0s1Tqlz5p7cWhg8s NRzmeCuPybp5AXl9dymubBqx1C9g+BeAoLe/FXqVJR+Mkf5nKIc8wRxNa+Q3Wg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch stable/13 has been updated by andrew: URL: https://cgit.FreeBSD.org/src/commit/?id=6d91006cd1b51409b0c56813e8bacca5c6ece632 commit 6d91006cd1b51409b0c56813e8bacca5c6ece632 Author: Olivier Houchard AuthorDate: 2021-03-10 18:01:41 +0000 Commit: Andrew Turner CommitDate: 2022-01-10 10:54:19 +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. MFC After: 1 week (cherry picked from commit c328f64d81079bad5064c8a387883df50ab5aaed) --- sys/arm64/arm64/locore.S | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/sys/arm64/arm64/locore.S b/sys/arm64/arm64/locore.S index c858b3cedc51..d906128ae9dc 100644 --- a/sys/arm64/arm64/locore.S +++ b/sys/arm64/arm64/locore.S @@ -833,7 +833,7 @@ esigcode: szsigcode: .quad esigcode - sigcode -ENTRY(aarch32_sigcode) +EENTRY(aarch32_sigcode) .word 0xe1a0000d // mov r0, sp .word 0xe2800040 // add r0, r0, #SIGF_UC .word 0xe59f700c // ldr r7, [pc, #12] @@ -841,7 +841,7 @@ ENTRY(aarch32_sigcode) .word 0xe59f7008 // ldr r7, [pc, #8] .word 0xef000000 // swi #0 .word 0xeafffffa // b . - 16 -END(aarch32_sigcode) +EEND(aarch32_sigcode) .word SYS_sigreturn .word SYS_exit .align 3