From nobody Sat Apr 20 10:34:47 2024 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 4VM7Dm1MdDz5HWgM; Sat, 20 Apr 2024 10:34:48 +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 4VM7Dl5BNDz4TJg; Sat, 20 Apr 2024 10:34:47 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1713609287; 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=jBeLsoqI6TrytbvdkzRiAd1uKP+CKsS87f97LsYmwVw=; b=WCzDXGPh/vtcWXKDH46ZwwVXgM4lyovp2/yEiGPBWawK2WMHRFhuvpbSoBh9wplOcUukoQ udzX6lUH+OnzCTYugFDwDzdcYJ9A/CM8u3012G8qW4khArcPRySR5SQX/q23y7Y9rUT7JG fnFy40sXKQNznrjuu7876H/wz9nrhqvR/vDOim1wWE+ZXmc8vLqzTaxCJDreFiK51rwy5n vsySd1CA+9SajE+eQo6rooVM7+C8k2XULtCDusyo2dhipDJtu1FKZ0jL/aiFRKJXpaWCr3 6ODQSC7u7jkLkVz3a15gMmn7AX1o+6kAfxpDfsoML7ePYmbAYRYtPCWv4GzFUw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1713609287; a=rsa-sha256; cv=none; b=kI6/nx18rT+QoJclQ1pRa9JgDk1OEps042iwdM8LTeN9khn/yHXRsAqw94FdYebkI/C1jE QdW8EBL7C5axGlNiWxTn3gwdUs8VsFFDo9XRbdTcnuJxKjW/48/LnOq/xArGe7Dd0l39ul EMu3X/Vi+nlPjNp03OGk20k03VL7pKYRCCB/E2HPYsOUSpMEbWM+qeByWciYEZsxhtjFIl 3auukb8h8vbHogGeUQvsR8BrPj4arJ+Lr/Iui1zwBIS/Sy+FEAKATKgxepJTOm5eDi/2wC fsmJLaP2Ecj16s9uRLIls6czDPsi5JCiMuwqw3J2mVlr7MOn4OQ1hGUBpFyHAA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1713609287; 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=jBeLsoqI6TrytbvdkzRiAd1uKP+CKsS87f97LsYmwVw=; b=dVdbC7hzN6eJs4E7wobOK+5Jkg+e/kqOfzqjy5nP4pDl8Uf6pZBM96mtkQ+vspjV51wUCX Z7rmVV2dVpdiWEKoOsiWmAENh8SQVeHPtL7iVbjc6nks+L8tpRtFAZd6W3DGscvrhTq/k7 nnw3V1ow1MkC9KzD5q7t0M0CkKme/dOgPGsffm0bavb6MTxAyEflGuaNNYdHc4APTSp6DD bbvtvRkNqwRmE4lvHqqwYwsYmhcWIwBdG+otQsgCYo6QewGIsp0w//dT5nzOjJiErl5j1Z eq+cgfGikYVLOrkYnlbTauaDjVNqlxQGKo3pUUDS2W2Y6EtRqny6hkQDuekU+A== 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 4VM7Dl4m7LzYrC; Sat, 20 Apr 2024 10:34:47 +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 43KAYlvT014289; Sat, 20 Apr 2024 10:34:47 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 43KAYlBq014286; Sat, 20 Apr 2024 10:34:47 GMT (envelope-from git) Date: Sat, 20 Apr 2024 10:34:47 GMT Message-Id: <202404201034.43KAYlBq014286@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Dimitry Andric Subject: git: 0764680cf8fd - stable/13 - Fix arm64 build after llvm 18.1.3 upgrade (take 2) 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: X-BeenThere: dev-commits-src-branches@freebsd.org Sender: owner-dev-commits-src-branches@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: dim X-Git-Repository: src X-Git-Refname: refs/heads/stable/13 X-Git-Reftype: branch X-Git-Commit: 0764680cf8fdcd53b781a54c1a697bddedb075da Auto-Submitted: auto-generated The branch stable/13 has been updated by dim: URL: https://cgit.FreeBSD.org/src/commit/?id=0764680cf8fdcd53b781a54c1a697bddedb075da commit 0764680cf8fdcd53b781a54c1a697bddedb075da Author: Dimitry Andric AuthorDate: 2024-04-07 09:23:06 +0000 Commit: Dimitry Andric CommitDate: 2024-04-20 10:29:09 +0000 Fix arm64 build after llvm 18.1.3 upgrade (take 2) Instead of compiling the whole sys/arm64/arm64/vfp.c file without -mgeneral-regs-only, which might have unwanted side effects, add ".arch_extension fp" / ".arch_extension nofp" pairs to the inline assembly. PR: 276104 Suggested by: andrew MFC after: 1 month (cherry picked from commit 61e482f2fcd53bbc7fd3d4cc8b7df79d5d57d75c) --- sys/arm64/arm64/vfp.c | 4 ++++ sys/conf/files.arm64 | 3 +-- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/sys/arm64/arm64/vfp.c b/sys/arm64/arm64/vfp.c index 9cdeb751f81a..01f52dad271e 100644 --- a/sys/arm64/arm64/vfp.c +++ b/sys/arm64/arm64/vfp.c @@ -105,6 +105,7 @@ vfp_store(struct vfpstate *state) vfp_state = state->vfp_regs; __asm __volatile( + ".arch_extension fp\n" "mrs %0, fpcr \n" "mrs %1, fpsr \n" "stp q0, q1, [%2, #16 * 0]\n" @@ -123,6 +124,7 @@ vfp_store(struct vfpstate *state) "stp q26, q27, [%2, #16 * 26]\n" "stp q28, q29, [%2, #16 * 28]\n" "stp q30, q31, [%2, #16 * 30]\n" + ".arch_extension nofp\n" : "=&r"(fpcr), "=&r"(fpsr) : "r"(vfp_state)); state->vfp_fpcr = fpcr; @@ -140,6 +142,7 @@ vfp_restore(struct vfpstate *state) fpsr = state->vfp_fpsr; __asm __volatile( + ".arch_extension fp\n" "ldp q0, q1, [%2, #16 * 0]\n" "ldp q2, q3, [%2, #16 * 2]\n" "ldp q4, q5, [%2, #16 * 4]\n" @@ -158,6 +161,7 @@ vfp_restore(struct vfpstate *state) "ldp q30, q31, [%2, #16 * 30]\n" "msr fpcr, %0 \n" "msr fpsr, %1 \n" + ".arch_extension nofp\n" : : "r"(fpcr), "r"(fpsr), "r"(vfp_state)); } diff --git a/sys/conf/files.arm64 b/sys/conf/files.arm64 index f72f5718ac19..bb593a8f9a01 100644 --- a/sys/conf/files.arm64 +++ b/sys/conf/files.arm64 @@ -76,8 +76,7 @@ arm64/arm64/uio_machdep.c standard arm64/arm64/uma_machdep.c standard arm64/arm64/undefined.c standard arm64/arm64/unwind.c optional ddb | kdtrace_hooks | stack -arm64/arm64/vfp.c standard \ - compile-with "${NORMAL_C:N-mgeneral-regs-only}" +arm64/arm64/vfp.c standard arm64/arm64/vm_machdep.c standard arm64/coresight/coresight.c standard