From 82a224b0daab28b8ca1c231be0886fc421c1a6dc Mon Sep 17 00:00:00 2001
From: "Tomoki, Karatsu" <49965247+t-karatsu@users.noreply.github.com>
Date: Tue, 13 Oct 2020 06:53:37 +0900
Subject: [PATCH] octave: Specify fortran calling-convention for Fujitsu
 compiler. (#19218)

---
 var/spack/repos/builtin/packages/octave/package.py | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/var/spack/repos/builtin/packages/octave/package.py b/var/spack/repos/builtin/packages/octave/package.py
index 26a21e78919..3d6d3e5ad9e 100644
--- a/var/spack/repos/builtin/packages/octave/package.py
+++ b/var/spack/repos/builtin/packages/octave/package.py
@@ -275,6 +275,10 @@ def configure_args(self):
             spec.satisfies('^intel-parallel-studio+mkl+ilp64')):
             config_args.append('F77_INTEGER_8_FLAG=-fdefault-integer-8')
 
+        # Use gfortran calling-convention %fj
+        if spec.satisfies('%fj'):
+            config_args.append('--enable-fortran-calling-convention=gfortran')
+
         return config_args
 
     # ========================================================================