From nobody Fri May 17 13:21:33 2024 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 4Vgnfk0L4hz5L9Xn; Fri, 17 May 2024 13:21:34 +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 4Vgnfj6scJz4736; Fri, 17 May 2024 13:21:33 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1715952094; 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=/jWVvpWH3RqZA8XqCc2zsOL4vrxIwGs1dn2VknV+dyk=; b=vS9+MsEgntjgdTt6yhIne9kwQj6ygQgj1NMO3Vj0+r/bNvVLWVPlbwg6AJ9xllBfumcba5 onYaa56/lAfMzum/7lN1RLVbmoUvI6ZAENsjnrCF4h2cjO7oTIYzpq0yBrhJdlKQTTJmn3 1OVMHwMw4YdAFUxTYHpoFltH5wXqPGZ5nJ3teJbOek7EaL6Yib5t52np6CG4u6V8ovP38r rgpRDvXgW64bIfAzFKliumMlYaroV9x87PjTEhtXonrZ4RMhZlD2GN8iiv/n3i1dSLMCUF mZOni0CowowgKMVZS9FaBGlmTh7rYGDrl0Y1/gA8MYBs6nqrsJGJUawr/LVEkg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1715952094; a=rsa-sha256; cv=none; b=VtFTHOa0mPhjK8421eqYpVz5wMTWNev9f1zT/C10aMmlAsGS1hAfS01uSkN2OnSaaijnQE K+5mX1PGP6dG7pPgXw/NkT2YWi7eVVxVwsk4gIxgIrBDVkwGOqyc7KmoL3BDGXXvzaQ80P njOeQYKn1rPq5oiz5Q3LH7QSb1qzMA0v//l4OAEwsKR3eUwCzVbvh7MZTVSeSjp1qL/1Nn TSDNrC8zMW2CsBr2t844Z9B+slLGFeufHScoH/wqTF76tgJamj+BZ76raAGXqYjZtZ0atv GXc1cO50NZXK+CfiWTWR2AFyv7Ggvvf259m5DTAsqp3KPJwqm0yXk3TZC946aQ== 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=1715952094; 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=/jWVvpWH3RqZA8XqCc2zsOL4vrxIwGs1dn2VknV+dyk=; b=gfE94KMnlUJvLTEVP2W8kGgZ9tnnj5Eo+yzYqu4ThtZfpDp49uMTy4uY0wF0JTy0TJk1qk uJZP6zlP1v0PmHK3xCg1q0E3+ty1iUw/BXcw3hZuNMkf+5OSP3zfBu+SEnOmrxI3Os7frK XBjsImetT+lHsJIInLH4riBejVQoNlLS3c8PhhM/9nIu3ww5HfyHwKjGug4jNf8L2gRKu8 SlC5HyET8aksAdpttYWlaBs7d5EIWOyDjUmvv/n9CMDEl2DJAXpWDxipwL9z84vRmSF72w AGHQhl5nbvWA4pQdz3dASTvUJFYZksOaiyEvFb6vU63jpaFc0ZgvJnY8+63WOw== 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 4Vgnfj6Swfzk6V; Fri, 17 May 2024 13:21:33 +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 44HDLXxe077763; Fri, 17 May 2024 13:21:33 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 44HDLXnm077760; Fri, 17 May 2024 13:21:33 GMT (envelope-from git) Date: Fri, 17 May 2024 13:21:33 GMT Message-Id: <202405171321.44HDLXnm077760@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Andrew Turner Subject: git: 4660d9658710 - main - arm64/vmm: Fix the build with GCC 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: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@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/main X-Git-Reftype: branch X-Git-Commit: 4660d9658710f69649018ca7b6b0be4b6d3bdd33 Auto-Submitted: auto-generated The branch main has been updated by andrew: URL: https://cgit.FreeBSD.org/src/commit/?id=4660d9658710f69649018ca7b6b0be4b6d3bdd33 commit 4660d9658710f69649018ca7b6b0be4b6d3bdd33 Author: Andrew Turner AuthorDate: 2024-05-16 14:35:00 +0000 Commit: Andrew Turner CommitDate: 2024-05-17 13:19:45 +0000 arm64/vmm: Fix the build with GCC - Fix the spelling of handle_el2_el1_irq64 - Add .section before .rodata as the GCC build needs it Sponsored by: Arm Ltd --- sys/arm64/vmm/vmm_hyp_el2.S | 2 +- sys/arm64/vmm/vmm_hyp_exception.S | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/sys/arm64/vmm/vmm_hyp_el2.S b/sys/arm64/vmm/vmm_hyp_el2.S index 7b49d3144dff..7012e238c9c8 100644 --- a/sys/arm64/vmm/vmm_hyp_el2.S +++ b/sys/arm64/vmm/vmm_hyp_el2.S @@ -30,7 +30,7 @@ #include - .rodata + .section .rodata .align PAGE_SHIFT .globl vmm_hyp_code vmm_hyp_code: diff --git a/sys/arm64/vmm/vmm_hyp_exception.S b/sys/arm64/vmm/vmm_hyp_exception.S index 0e8b31ae8b12..9a9dc6901f40 100644 --- a/sys/arm64/vmm/vmm_hyp_exception.S +++ b/sys/arm64/vmm/vmm_hyp_exception.S @@ -332,7 +332,7 @@ LENTRY(handle_el2_el1_irq64) 2: ldr x9, [sp], #16 ret -LEND(handle_el2_el1_irq) +LEND(handle_el2_el1_irq64) LENTRY(handle_el2_el1_fiq64) do_world_switch_to_host