branch master updated: gnu: openjdk9: Fix build on aarch64.

[guix-commits]

This is an automated email from the git hooks/post-receive script.

andreas pushed a commit to branch master
in repository guix.

The following commit(s) were added to refs/heads/master by this push:
     new 9ca9b0afb6 gnu: openjdk9: Fix build on aarch64.
9ca9b0afb6 is described below

commit 9ca9b0afb641f045e0021a00ced579ca1615af5b
Author: Christopher Baines <mail@cbaines.net>
AuthorDate: Sat May 6 11:50:47 2023 +0100

    gnu: openjdk9: Fix build on aarch64.
    
    * gnu/packages/java.scm (openjdk9)[arguments]: Add 'patch-for-aarch64 phase 
to
    remove duplicate line in interp_masm_aarch64.hpp.
    
    Signed-off-by: Andreas Enge <andreas@enge.fr>
---
 gnu/packages/java.scm | 12 ++++++++++++
 1 file changed, 12 insertions(+)

diff --git a/gnu/packages/java.scm b/gnu/packages/java.scm
index 7ad1116527..dd6c549a25 100644
--- a/gnu/packages/java.scm
+++ b/gnu/packages/java.scm
@@ -884,6 +884,18 @@ new Date();"))
 
        #: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