fix cmake fortran check for CMK_FORTRAN_USES_NOSCORE and fix XLC (#3461)

Author: matthiasdiener

CMakeLists.txt

@@ -54,7 +54,8 @@ elseif(CMAKE_CXX_COMPILER_ID STREQUAL "Cray")
 elseif(CMAKE_CXX_COMPILER_ID STREQUAL "PGI")
   set(CMK_COMPILER pgcc)
 elseif(CMAKE_CXX_COMPILER_ID STREQUAL "XL")
-  set(CMK_COMPILER xlc)
+  # FIXME: No support for 32-bit XLC
+  set(CMK_COMPILER xlc64)
 elseif(CMAKE_CXX_COMPILER_ID STREQUAL "MSVC" OR (CMAKE_CXX_COMPILER_ID STREQUAL "" AND (CMAKE_SYSTEM_NAME STREQUAL "Windows" OR CMAKE_SYSTEM_NAME STREQUAL "CYGWIN")))
   set(CMK_COMPILER msvc)
 else()
@@ -90,7 +91,7 @@ if(NOT ARCH STREQUAL CMAKE_HOST_SYSTEM_PROCESSOR)
     message(WARNING "Attempting to cross-compile from ${CMAKE_HOST_SYSTEM_PROCESSOR} to ${ARCH}. This is only supported for x86_64 -> i386 currently.")
     set(CMAKE_C_FLAGS -m32)
     set(CMAKE_CXX_FLAGS -m32)
-    set(CMAKE_FORTRAN_FLAGS -m32)
+    set(CMAKE_Fortran_FLAGS -m32)
   else()
     message(WARNING "Cross-compiling from  ${CMAKE_HOST_SYSTEM_PROCESSOR} to ${ARCH} is not supported currently.")
   endif()

cmake/detect-features-fortran.cmake

@@ -4,14 +4,14 @@ set(CMK_FORTRAN_USES_ONESCORE 0)
 set(CMK_FORTRAN_USES_NOSCORE 0)
 set(CMK_FORTRAN_USES_ALLCAPS 0)
 
-if(${CMK_CAN_LINK_FORTRAN})
-  if(${FortranCInterface_GLOBAL_SUFFIX} STREQUAL "__")
+if(CMK_CAN_LINK_FORTRAN)
+  if("${FortranCInterface_GLOBAL_SUFFIX}" STREQUAL "__")
     set(CMK_FORTRAN_USES_TWOSCORE 1)
-  elseif(${FortranCInterface_GLOBAL_SUFFIX} STREQUAL "_")
+  elseif("${FortranCInterface_GLOBAL_SUFFIX}" STREQUAL "_")
     set(CMK_FORTRAN_USES_ONESCORE 1)
-  elseif(${FortranCInterface_GLOBAL_SUFFIX} STREQUAL "")
+  elseif("${FortranCInterface_GLOBAL_SUFFIX}" STREQUAL "")
     set(CMK_FORTRAN_USES_NOSCORE 1)
-  elseif(${FortranCInterface_GLOBAL_CASE} STREQUAL "UPPER")
+  elseif("${FortranCInterface_GLOBAL_CASE}" STREQUAL "UPPER")
     set(CMK_FORTRAN_USES_ALLCAPS 1)
   endif()
 endif()

src/arch/common/cc-xlc64.sh

@@ -1,8 +1,8 @@
 COMMENT="Enable 64-bit mode (-q64)"
 CMK_CC='xlc_r -q64 '
 CMK_CXX='xlC_r -q64 '
-CMK_C_OPTIMIZE='-O3 -qstrict -Q!  '
-CMK_CXX_OPTIMIZE='-O3 -qstrict -Q! '
+CMK_C_OPTIMIZE='-O3 -qstrict '
+CMK_CXX_OPTIMIZE='-O3 -qstrict '
 CMK_PIC='-qpic=small'
 
 CMK_LD="$CMK_CC "

src/arch/multicore-linux-ppc64le/cc-xlc64.sh

@@ -1,8 +1,8 @@
 COMMENT="Enable 64-bit mode (-q64)"
 CMK_CC='xlc_r -q64 '
 CMK_CXX='xlC_r -q64 '
-CMK_C_OPTIMIZE='-O3 -qstrict -Q!  '
-CMK_CXX_OPTIMIZE='-O3 -qstrict -Q! '
+CMK_C_OPTIMIZE='-O3 -qstrict '
+CMK_CXX_OPTIMIZE='-O3 -qstrict '
 CMK_LD="$CMK_CC "
 CMK_LDXX="$CMK_CXX "