@@ -310,6 +310,9 @@ if (${TARGET} STREQUAL NEOVERSEV1)
310310 set (KERNEL_DEFINITIONS "${KERNEL_DEFINITIONS} -march=armv8.2-a+sve" )
311311 endif ()
312312 endif ()
313+ if (${TARGET} STREQUAL ARMV9SME)
314+ set (KERNEL_DEFINITIONS "${KERNEL_DEFINITIONS} -march=armv9-a+sme -O3" )
315+ endif ()
313316 if (${TARGET} STREQUAL A64FX)
314317 if (${CMAKE_C_COMPILER_ID} STREQUAL "PGI" AND NOT NO_SVE)
315318 set (KERNEL_DEFINITIONS "${KERNEL_DEFINITIONS} -Msve-intrinsics -march=armv8.2-a+sve -mtune=a64fx" )
@@ -382,6 +385,8 @@ if (NEED_PIC)
382385 if (NOT NOFORTRAN)
383386 if (${F_COMPILER} STREQUAL "SUN" )
384387 set (FCOMMON_OPT "${FCOMMON_OPT} -pic" )
388+ elseif (${F_COMPILER} STREQUAL "NAGFOR" )
389+ set (FCOMMON_OPT "${FCOMMON_OPT} -PIC" )
385390 else ()
386391 set (FCOMMON_OPT "${FCOMMON_OPT} -fPIC" )
387392 endif ()
@@ -640,17 +645,17 @@ if (${CMAKE_SYSTEM_NAME} STREQUAL "Windows")
640645endif ()
641646
642647if (CMAKE_Fortran_COMPILER)
643- if ("${F_COMPILER} " STREQUAL "NAG" OR "${F_COMPILER} " STREQUAL "CRAY" OR CMAKE_Fortran_COMPILER_ID MATCHES "LLVMFlang.*" )
644- set (FILTER_FLAGS "-msse3;-mssse3;-msse4.1;-mavx;-mavx2,-mskylake-avx512" )
645- if (CMAKE_Fortran_COMPILER_ID MATCHES "LLVMFlang.*" )
646- message (STATUS "removing fortran flags" )
647- set (FILTER_FLAGS "${FILTER_FLAGS} ;-m32;-m64" )
648+ if ("${F_COMPILER} " STREQUAL "NAGFOR" OR "${F_COMPILER} " STREQUAL "CRAY" OR CMAKE_Fortran_COMPILER_ID MATCHES "LLVMFlang.*" )
649+ set (FILTER_FLAGS "-msse3;-mssse3;-msse4.1;-mavx;-mavx2,-mskylake-avx512" )
650+ if (CMAKE_Fortran_COMPILER_ID MATCHES "LLVMFlang.*" )
651+ message (STATUS "removing fortran flags" )
652+ set (FILTER_FLAGS "${FILTER_FLAGS} ;-m32;-m64" )
653+ endif ()
654+ foreach (FILTER_FLAG ${FILTER_FLAGS} )
655+ string (REPLACE ${FILTER_FLAG} "" LAPACK_FFLAGS ${LAPACK_FFLAGS} )
656+ string (REPLACE ${FILTER_FLAG} "" LAPACK_FPFLAGS ${LAPACK_FPFLAGS} )
657+ endforeach ()
648658 endif ()
649- foreach (FILTER_FLAG ${FILTER_FLAGS} )
650- string (REPLACE ${FILTER_FLAG} "" LAPACK_FFLAGS ${LAPACK_FFLAGS} )
651- string (REPLACE ${FILTER_FLAG} "" LAPACK_FPFLAGS ${LAPACK_FPFLAGS} )
652- endforeach ()
653- endif ()
654659endif ()
655660
656661if ("${F_COMPILER} " STREQUAL "GFORTRAN" )
0 commit comments