Add ieee and recursive options for Sun Fortran

Makefile.system

@@ -93,6 +93,12 @@ endif
 ifdef TARGET
 GETARCH_FLAGS := -DFORCE_$(TARGET)
 GETARCH_FLAGS += -DUSER_TARGET
+ifeq ($(TARGET), GENERIC)
+ifeq ($(DYNAMIC_ARCH), 1)
+override NO_EXPRECISION=1
+export NO_EXPRECiSION
+endif
+endif
 endif
 
 # Force fallbacks for 32bit
@@ -319,6 +325,7 @@ ifeq ($(GCCVERSIONGTEQ7),1)
 else
 	GCCDUMPVERSION_PARAM := -dumpversion
 endif
+GCCMINORVERSIONGTEQ1 := $(shell expr `$(CC) $(GCCDUMPVERSION_PARAM) | cut -f2 -d.` \>= 1)
 GCCMINORVERSIONGTEQ2 := $(shell expr `$(CC) $(GCCDUMPVERSION_PARAM) | cut -f2 -d.` \>= 2)
 GCCMINORVERSIONGTEQ7 := $(shell expr `$(CC) $(GCCDUMPVERSION_PARAM) | cut -f2 -d.` \>= 7)
 endif
@@ -855,7 +862,7 @@ CCOMMON_OPT += -DF_INTERFACE_FLANG
 FCOMMON_OPT += -Mrecursive -Kieee
 ifeq ($(OSNAME), Linux)
 ifeq ($(ARCH), x86_64)
-FLANG_VENDOR := $(shell expr `$(FC) --version|cut -f 1 -d "."|head -1`)
+FLANG_VENDOR := $(shell `$(FC) --version|cut -f 1 -d "."|head -1`)
 ifeq ($(FLANG_VENDOR),AOCC)
 FCOMMON_OPT += -fno-unroll-loops
 endif
@@ -1102,15 +1109,16 @@ ifeq ($(ARCH), x86)
 CCOMMON_OPT  += -m32
 else
 ifdef BINARY64
-FCOMMON_OPT  += -m64
+CCOMMON_OPT  += -m64
 else
-FCOMMON_OPT  += -m32
+CCOMMON_OPT  += -m32
 endif
 endif
 endif
 
 ifeq ($(F_COMPILER), SUN)
-CCOMMON_OPT  += -DF_INTERFACE_SUN
+CCOMMON_OPT  += -DF_INTERFACE_SUN 
+FCOMMON_OPT  += -ftrap=%none -xrecursive
 ifeq ($(ARCH), x86)
 FCOMMON_OPT  += -m32
 else
@@ -1286,9 +1294,11 @@ KERNELDIR	= $(TOPDIR)/kernel/$(ARCH)
 
 include $(TOPDIR)/Makefile.$(ARCH)
 
-#ifneq ($(C_COMPILER), PGI)
-#CCOMMON_OPT     += -UASMNAME -UASMFNAME -UNAME -UCNAME -UCHAR_NAME -UCHAR_CNAME
-#endif
+ifneq ($(C_COMPILER), PGI)
+ifneq ($(C_COMPILER), SUN)
+CCOMMON_OPT     += -UASMNAME -UASMFNAME -UNAME -UCNAME -UCHAR_NAME -UCHAR_CNAME
+endif
+endif
 CCOMMON_OPT	+= -DASMNAME=$(FU)$(*F) -DASMFNAME=$(FU)$(*F)$(BU) -DNAME=$(*F)$(BU) -DCNAME=$(*F) -DCHAR_NAME=\"$(*F)$(BU)\" -DCHAR_CNAME=\"$(*F)\"
 
 ifeq ($(CORE), PPC440)

fc.cmake

@@ -0,0 +1,222 @@
+##
+## Author: Hank Anderson <hank@statease.com>
+## Description: Ported from portion of OpenBLAS/Makefile.system
+##              Sets Fortran related variables.
+
+if (INTERFACE64)
+  set(SUFFIX64 64)
+  set(SUFFIX64_UNDERSCORE _64)
+endif()
+
+if (${F_COMPILER} STREQUAL "FLANG")
+  set(CCOMMON_OPT "${CCOMMON_OPT} -DF_INTERFACE_FLANG")
+  if (BINARY64 AND INTERFACE64)
+    set(FCOMMON_OPT "${FCOMMON_OPT} -i8")
+  endif ()
+  if (USE_OPENMP)
+    set(FCOMMON_OPT "${FCOMMON_OPT} -fopenmp")
+  endif ()
+  set(FCOMMON_OPT "${FCOMMON_OPT} -Mrecursive -Kieee")
+endif ()
+
+if (${F_COMPILER} STREQUAL "G77")
+  set(CCOMMON_OPT "${CCOMMON_OPT} -DF_INTERFACE_G77")
+  set(FCOMMON_OPT "${FCOMMON_OPT} -Wall")
+  if (NOT NO_BINARY_MODE)
+    if (BINARY64)
+      set(FCOMMON_OPT "${FCOMMON_OPT} -m64")
+    else ()
+      set(FCOMMON_OPT "${FCOMMON_OPT} -m32")
+    endif ()
+  endif ()
+endif ()
+
+if (${F_COMPILER} STREQUAL "G95")
+  set(CCOMMON_OPT "${CCOMMON_OPT} -DF_INTERFACE_G95")
+  set(FCOMMON_OPT "${FCOMMON_OPT} -Wall")
+  if (NOT NO_BINARY_MODE)
+    if (BINARY64)
+      set(FCOMMON_OPT "${FCOMMON_OPT} -m64")
+    else ()
+      set(FCOMMON_OPT "${FCOMMON_OPT} -m32")
+    endif ()
+  endif ()
+endif ()
+
+if (${F_COMPILER} STREQUAL "GFORTRAN")
+  set(CCOMMON_OPT "${CCOMMON_OPT} -DF_INTERFACE_GFORT")
+  # ensure reentrancy of lapack codes
+  set(FCOMMON_OPT "${FCOMMON_OPT} -Wall -frecursive")
+  # work around ABI violation in passing string arguments from C
+  set(FCOMMON_OPT "${FCOMMON_OPT} -fno-optimize-sibling-calls")
+  #Don't include -lgfortran, when NO_LAPACK=1 or lsbcc
+  if (NOT NO_LAPACK)
+    set(EXTRALIB "{EXTRALIB} -lgfortran")
+  endif ()
+  if (NO_BINARY_MODE)
+    if (MIPS64)
+      if (BINARY64)
+        set(FCOMMON_OPT "${FCOMMON_OPT} -mabi=64")
+      else ()
+        set(FCOMMON_OPT "${FCOMMON_OPT} -mabi=n32")
+      endif ()
+    endif ()
+  else ()
+    if (BINARY64)
+      set(FCOMMON_OPT "${FCOMMON_OPT} -m64")
+      if (INTERFACE64)
+        set(FCOMMON_OPT "${FCOMMON_OPT} -fdefault-integer-8")
+      endif ()
+    else ()
+      set(FCOMMON_OPT "${FCOMMON_OPT} -m32")
+    endif ()
+  endif ()
+
+  if (USE_OPENMP)
+    set(FCOMMON_OPT "${FCOMMON_OPT} -fopenmp")
+  endif ()
+endif ()
+
+if (${F_COMPILER} STREQUAL "INTEL")
+  set(CCOMMON_OPT "${CCOMMON_OPT} -DF_INTERFACE_INTEL")
+  if (INTERFACE64)
+    set(FCOMMON_OPT "${FCOMMON_OPT} -i8")
+  endif ()
+  set(FCOMMON_OPT "${FCOMMON_OPT} -recursive")
+  if (USE_OPENMP)
+    set(FCOMMON_OPT "${FCOMMON_OPT} -openmp")
+  endif ()
+endif ()
+
+if (${F_COMPILER} STREQUAL "FUJITSU")
+  set(CCOMMON_OPT "${CCOMMON_OPT} -DF_INTERFACE_FUJITSU")
+  if (USE_OPENMP)
+    set(FCOMMON_OPT "${FCOMMON_OPT} -openmp")
+  endif ()
+endif ()
+
+if (${F_COMPILER} STREQUAL "IBM")
+  set(CCOMMON_OPT "${CCOMMON_OPT} -DF_INTERFACE_IBM")
+  # FCOMMON_OPT	+= -qarch=440
+  if (BINARY64)
+    set(FCOMMON_OPT "${FCOMMON_OPT} -q64")
+    if (INTERFACE64)
+      set(FCOMMON_OPT "${FCOMMON_OPT} -qintsize=8")
+    endif ()
+  else ()
+    set(FCOMMON_OPT "${FCOMMON_OPT} -q32")
+  endif ()
+  if (USE_OPENMP)
+    set(FCOMMON_OPT "${FCOMMON_OPT} -openmp")
+  endif ()
+endif ()
+
+if (${F_COMPILER} STREQUAL "PGI")
+  set(CCOMMON_OPT "${CCOMMON_OPT} -DF_INTERFACE_PGI")
+  set(COMMON_PROF "${COMMON_PROF} -DPGICOMPILER")
+  if (BINARY64)
+    if (INTERFACE64)
+      set(FCOMMON_OPT "${FCOMMON_OPT} -i8")
+    endif ()
+    set(FCOMMON_OPT "${FCOMMON_OPT} -tp p7-64")
+  else ()
+    set(FCOMMON_OPT "${FCOMMON_OPT} -tp p7")
+  endif ()
+  set(FCOMMON_OPT "${FCOMMON_OPT} -Mrecursive")
+  if (USE_OPENMP)
+    set(FCOMMON_OPT "${FCOMMON_OPT} -mp")
+  endif ()
+endif ()
+
+if (${F_COMPILER} STREQUAL "PATHSCALE")
+  set(CCOMMON_OPT "${CCOMMON_OPT} -DF_INTERFACE_PATHSCALE")
+  if (BINARY64)
+    if (INTERFACE64)
+      set(FCOMMON_OPT "${FCOMMON_OPT} -i8")
+    endif ()
+  endif ()
+
+  if (NOT MIPS64)
+    if (NOT BINARY64)
+      set(FCOMMON_OPT "${FCOMMON_OPT} -m32")
+    else ()
+      set(FCOMMON_OPT "${FCOMMON_OPT} -m64")
+    endif ()
+  else ()
+    if (BINARY64)
+      set(FCOMMON_OPT "${FCOMMON_OPT} -mabi=64")
+    else ()
+    set(FCOMMON_OPT "${FCOMMON_OPT} -mabi=n32")
+    endif ()
+  endif ()
+
+  if (USE_OPENMP)
+    set(FCOMMON_OPT "${FCOMMON_OPT} -mp")
+  endif ()
+endif ()
+
+if (${F_COMPILER} STREQUAL "OPEN64")
+
+  set(CCOMMON_OPT "${CCOMMON_OPT} -DF_INTERFACE_OPEN64")
+  if (BINARY64)
+    if (INTERFACE64)
+      set(FCOMMON_OPT "${FCOMMON_OPT} -i8")
+    endif ()
+  endif ()
+
+  if (MIPS64)
+
+    if (NOT BINARY64)
+      set(FCOMMON_OPT "${FCOMMON_OPT} -n32")
+    else ()
+      set(FCOMMON_OPT "${FCOMMON_OPT} -n64")
+    endif ()
+
+    if (${CORE} STREQUAL "LOONGSON3A")
+      set(FCOMMON_OPT "${FCOMMON_OPT} -loongson3 -static")
+    endif ()
+
+    if (${CORE} STREQUAL "LOONGSON3B")
+    set(FCOMMON_OPT "${FCOMMON_OPT} -loongson3 -static")
+    endif ()
+  else ()
+    if (NOT BINARY64)
+      set(FCOMMON_OPT "${FCOMMON_OPT} -m32")
+    else ()
+      set(FCOMMON_OPT "${FCOMMON_OPT} -m64")
+    endif ()
+  endif ()
+
+  if (USE_OPENMP)
+    set(FEXTRALIB "${FEXTRALIB} -lstdc++")
+    set(FCOMMON_OPT "${FCOMMON_OPT} -mp")
+  endif ()
+endif ()
+
+if (${F_COMPILER} STREQUAL "SUN")
+  set(CCOMMON_OPT "${CCOMMON_OPT} -DF_INTERFACE_SUN")
+  set(FCOMMON_OPT "${FCOMMON_OPT} -ftrap=%none -xrecursive")
+  if (X86 OR NOT BINARY64)
+    set(FCOMMON_OPT "${FCOMMON_OPT} -m32")
+  else ()
+    set(FCOMMON_OPT "${FCOMMON_OPT} -m64")
+  endif ()
+  if (USE_OPENMP)
+    set(FCOMMON_OPT "${FCOMMON_OPT} -xopenmp=parallel")
+  endif ()
+endif ()
+
+if (${F_COMPILER} STREQUAL "COMPAQ")
+  set(CCOMMON_OPT "${CCOMMON_OPT} -DF_INTERFACE_COMPAQ")
+  if (USE_OPENMP)
+    set(FCOMMON_OPT "${FCOMMON_OPT} -openmp")
+  endif ()
+endif ()
+
+# from the root Makefile - this is for lapack-netlib to compile the correct secnd file.
+if (${F_COMPILER} STREQUAL "GFORTRAN")
+  set(TIMER "INT_ETIME")
+else ()
+  set(TIMER "NONE")
+endif ()
+