Skip to content

Commit 8fc2c2d

Browse files
authored
Fix missing support for INTERFACE64 on ARM64 and MIPS64
1 parent 82b81c0 commit 8fc2c2d

File tree

1 file changed

+6
-3
lines changed

1 file changed

+6
-3
lines changed

cmake/fc.cmake

Lines changed: 6 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -6,9 +6,6 @@
66
if (${F_COMPILER} STREQUAL "FLANG" AND NOT CMAKE_Fortran_COMPILER_ID STREQUAL "LLVMFlang")
77
# This is for classic Flang. LLVM Flang is handled with gfortran below.
88
set(CCOMMON_OPT "${CCOMMON_OPT} -DF_INTERFACE_FLANG")
9-
if (BINARY64 AND INTERFACE64)
10-
set(FCOMMON_OPT "${FCOMMON_OPT} -i8")
11-
endif ()
129
if (USE_OPENMP)
1310
set(FCOMMON_OPT "${FCOMMON_OPT} -fopenmp")
1411
endif ()
@@ -55,6 +52,9 @@ if (${F_COMPILER} STREQUAL "GFORTRAN" OR ${F_COMPILER} STREQUAL "F95" OR CMAKE_F
5552
if (MIPS64)
5653
if (BINARY64)
5754
set(FCOMMON_OPT "${FCOMMON_OPT} -mabi=64")
55+
if (INTERFACE64)
56+
set(FCOMMON_OPT "${FCOMMON_OPT} -fdefault-integer-8")
57+
endif ()
5858
else ()
5959
set(FCOMMON_OPT "${FCOMMON_OPT} -mabi=n32")
6060
endif ()
@@ -83,6 +83,9 @@ if (${F_COMPILER} STREQUAL "GFORTRAN" OR ${F_COMPILER} STREQUAL "F95" OR CMAKE_F
8383
endif ()
8484
endif ()
8585
endif ()
86+
if (ARM64 AND INTERFACE64)
87+
set(FCOMMON_OPT "${FCOMMON_OPT} -fdefault-integer-8")
88+
endif ()
8689
else ()
8790
if (BINARY64)
8891
set(FCOMMON_OPT "${FCOMMON_OPT} -m64")

0 commit comments

Comments
 (0)