From patchwork Sat May 6 10:50:47 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Christopher Baines X-Patchwork-Id: 49829 Return-Path: X-Original-To: patchwork@mira.cbaines.net Delivered-To: patchwork@mira.cbaines.net Received: by mira.cbaines.net (Postfix, from userid 113) id 01B7B27BBEA; Sat, 6 May 2023 11:51:27 +0100 (BST) X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-3.9 required=5.0 tests=BAYES_00,MAILING_LIST_MULTI, RCVD_IN_MSPIKE_H2,SPF_HELO_PASS autolearn=ham autolearn_force=no version=3.4.6 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mira.cbaines.net (Postfix) with ESMTPS id 000C027BBE2 for ; Sat, 6 May 2023 11:51:25 +0100 (BST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1pvFVK-0006oD-0m; Sat, 06 May 2023 06:51:06 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1pvFVH-0006no-SA for guix-patches@gnu.org; Sat, 06 May 2023 06:51:03 -0400 Received: from debbugs.gnu.org ([209.51.188.43]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1pvFVG-0004MH-Ua for guix-patches@gnu.org; Sat, 06 May 2023 06:51:03 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1pvFVG-0001N5-JO for guix-patches@gnu.org; Sat, 06 May 2023 06:51:02 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#63327] [PATCH] gnu: openjdk9: Fix build on aarch64. Resent-From: Christopher Baines Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Sat, 06 May 2023 10:51:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: report 63327 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 63327@debbugs.gnu.org X-Debbugs-Original-To: guix-patches@gnu.org Received: via spool by submit@debbugs.gnu.org id=B.16833702535209 (code B ref -1); Sat, 06 May 2023 10:51:02 +0000 Received: (at submit) by debbugs.gnu.org; 6 May 2023 10:50:53 +0000 Received: from localhost ([127.0.0.1]:59515 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1pvFV7-0001Lv-Kb for submit@debbugs.gnu.org; Sat, 06 May 2023 06:50:53 -0400 Received: from lists.gnu.org ([209.51.188.17]:34166) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1pvFV5-0001Ld-LR for submit@debbugs.gnu.org; Sat, 06 May 2023 06:50:51 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1pvFV5-0006mw-A0 for guix-patches@gnu.org; Sat, 06 May 2023 06:50:51 -0400 Received: from mira.cbaines.net ([212.71.252.8]) by eggs.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1pvFV3-0004BO-BM for guix-patches@gnu.org; Sat, 06 May 2023 06:50:50 -0400 Received: from localhost (unknown [IPv6:2a02:8010:68c1:0:54d1:d5d4:280e:f699]) by mira.cbaines.net (Postfix) with ESMTPSA id AEA0D27BBE2 for ; Sat, 6 May 2023 11:50:47 +0100 (BST) Received: from localhost (localhost [local]) by localhost (OpenSMTPD) with ESMTPA id 2fefaa5c for ; Sat, 6 May 2023 10:50:47 +0000 (UTC) From: Christopher Baines Date: Sat, 6 May 2023 11:50:47 +0100 Message-Id: X-Mailer: git-send-email 2.39.1 MIME-Version: 1.0 Received-SPF: pass client-ip=212.71.252.8; envelope-from=mail@cbaines.net; helo=mira.cbaines.net X-Spam_score_int: -18 X-Spam_score: -1.9 X-Spam_bar: - X-Spam_report: (-1.9 / 5.0 requ) BAYES_00=-1.9, SPF_HELO_PASS=-0.001, SPF_PASS=-0.001, T_SCC_BODY_TEXT_LINE=-0.01, UNPARSEABLE_RELAY=0.001 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list X-BeenThere: guix-patches@gnu.org List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org Sender: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org X-getmail-retrieved-from-mailbox: Patches * gnu/packages/java.scm (openjdk9)[arguments]: Add 'patch-for-aarch64 phase to remove duplicate line in interp_masm_aarch64.hpp. --- gnu/packages/java.scm | 12 ++++++++++++ 1 file changed, 12 insertions(+) base-commit: 64086a4fa449a9f6d2f835fcdf5498222b309e3a diff --git a/gnu/packages/java.scm b/gnu/packages/java.scm index 067284017c..166417a73d 100644 --- a/gnu/packages/java.scm +++ b/gnu/packages/java.scm @@ -884,6 +884,18 @@ (define-public openjdk9 #:phases (modify-phases %standard-phases + ,@(if (target-aarch64?) + `((add-after 'unpack 'patch-for-aarch64 + (lambda _ + (substitute* "hotspot/src/cpu/aarch64/vm/interp_masm_aarch64.hpp" + ;; This line is duplicated, so remove both occurrences, + ;; then add back one occurrence by substituting a + ;; comment that occurs once. + (("using MacroAssembler::call_VM_leaf_base;") "") + (("Interpreter specific version of call_VM_base") + "Interpreter specific version of call_VM_base + using MacroAssembler::call_VM_leaf_base;"))))) + '()) (add-after 'patch-source-shebangs 'fix-java-shebangs (lambda _ ;; This file was "fixed" by patch-source-shebangs, but it requires