cleanup: remove support for g95 fortran compiler 97/3497/2
authorMatthias Diener <mdiener@illinois.edu>
Wed, 10 Jan 2018 19:43:01 +0000 (13:43 -0600)
committerMatthias Diener <mdiener@illinois.edu>
Wed, 10 Jan 2018 19:43:35 +0000 (13:43 -0600)
g95 has not been updated since 2013 (last released version, 0.93, is
from 2012).
Superseded by gfortran.

Change-Id: If5e8c4e6e77b3f0ae21fdd19c20ff09c6727c333

README
src/arch/common/conv-mach-darwin.sh
src/arch/common/conv-mach-g95.h [deleted file]
src/arch/common/conv-mach-g95.sh [deleted file]
src/ck-core/main.C
src/util/charmrun-src/charmrun.C

diff --git a/README b/README
index d0273edab7f3b4b8a1345cdfd4366ecb5917d541..9732233207f083a9929bd5f0e05e2870aa519db8 100644 (file)
--- a/README
+++ b/README
@@ -186,7 +186,7 @@ need to choose <options> from the following list:
          > ./build charm++ netlrts-linux help
          will give:
 Supported compilers: clang craycc gcc icc iccstatic pgcc xlc xlc64
-Supported options: bigemulator bigsim causalft clustermatic g95 gfortran ifort lcs local mlogft omp ooc papi persistent pgf90 pxshm scyld smp syncft sysvshm tcp tsan turing
+Supported options: bigemulator bigsim causalft clustermatic gfortran ifort lcs local mlogft omp ooc papi persistent pgf90 pxshm scyld smp syncft sysvshm tcp tsan turing
 
 
 BUILDING THE SOURCE
index e39cf63ff4e161c4f3cdd8b71fa080202890037a..ad36bd548748686e5648d09c94c866b8bb81bf6b 100644 (file)
@@ -22,6 +22,6 @@ CMK_LD_SHARED_ABSOLUTE_PATH=true
 
 CMK_DEFS='-mmacosx-version-min=10.7 -D_DARWIN_C_SOURCE'
 
-# Assumes GNU fortran compiler:
-CMK_CF77="g95 -mmacosx-version-min=10.7"
-CMK_CF90="g95 -mmacosx-version-min=10.7"
+# Assumes gfortran compiler:
+CMK_CF77="gfortran -mmacosx-version-min=10.7"
+CMK_CF90="gfortran -mmacosx-version-min=10.7"
diff --git a/src/arch/common/conv-mach-g95.h b/src/arch/common/conv-mach-g95.h
deleted file mode 100644 (file)
index 6ca26ed..0000000
+++ /dev/null
@@ -1,2 +0,0 @@
-
-#define CMK_G95                               1
diff --git a/src/arch/common/conv-mach-g95.sh b/src/arch/common/conv-mach-g95.sh
deleted file mode 100644 (file)
index 3393651..0000000
+++ /dev/null
@@ -1,35 +0,0 @@
-CMK_CC_FLAGS="$CMK_CC_FLAGS -DCMK_G95"
-CMK_CXX_FLAGS="$CMK_CXX_FLAGS -DCMK_G95"
-
-if test -n "$CMK_MACOSX"
-then
-CMK_F90FLAGS="$CMK_F90FLAGS -fno-common"
-fi
-
-CMK_CF90=`which g95 2>/dev/null`
-CMK_FPP="cpp -P -CC"
-CMK_CF90="$CMK_CF90 $CMK_F90FLAGS -fPIC -fno-second-underscore -fdollar-ok"
-CMK_CF90_FIXED="$CMK_CF90 -ffixed-form "
-# find f90 library:
-#it can be at g95-install/lib/gcc-lib/i686-pc-linux-gnu/4.0.1
-F90DIR=`which g95 2> /dev/null`
-readlinkcmd=`which readlink 2> /dev/null`
-if test -h "$F90DIR" && test -x "$readlinkcmd"
-then
-  LINKDIR=`readlink $F90DIR`
-  case "$LINKDIR" in
-  \/*)
-       F90DIR=$LINKDIR
-       ;;
-  *)
-       basedir=`dirname $F90DIR`
-       F90DIR="$basedir/$LINKDIR"
-       ;;
-  esac
-fi
-F90DIR="`dirname $F90DIR`"
-F90LIBDIR=`cd $F90DIR/../lib/gcc-lib/*/*; pwd`
-CMK_F90LIBS="-L$F90LIBDIR -lf95 -lgcc_eh"
-
-CMK_F90_USE_MODDIR=1
-CMK_F90_MODINC="-I"
index f4d6987a2ae0ae4cb41619a3abe509a14e3ee06a..2214e5999349bf076e79e6eaa30af03319e1b45b 100644 (file)
@@ -1,25 +1,13 @@
 #include "ck.h"
 
-#undef CMK_G95
-
-#ifdef CMK_G95
-extern "C" void g95_runtime_start(int argc, char *argv[]);
-extern "C" void g95_runtime_stop();
-#endif
-
 #ifndef __BIGSIM__
 int main(int argc, char **argv)
 {
   int stack_top=0;
   memory_stack_top = &stack_top;
-#ifdef CMK_G95
-  g95_runtime_start(argc, argv);
-#endif
+
   ConverseInit(argc, argv, (CmiStartFn) _initCharm, 0, 0);
-#ifdef CMK_G95
-    // FIXME:  not right place to call, but not calling it does not quite hurt
-  g95_runtime_stop();
-#endif
+
   return 0;
 }
 #endif
index c54ef61a6152923fbda2aed9b2d1c35475efb13d..b4a01076d23426126b64099ed9bf0075fc2637f9 100644 (file)
@@ -4624,9 +4624,6 @@ void ssh_script(FILE *f, int nodeno, int rank0no, const char **argv,
   else
     fprintf(f, "CmiNumNodes='%d'; export CmiNumNodes\n", nodetab_rank0_size);
 
-#ifdef CMK_G95
-  fprintf(f, "G95_UNBUFFERED_ALL=TRUE; export G95_UNBUFFERED_ALL\n");
-#endif
 #ifdef CMK_GFORTRAN
   fprintf(f, "GFORTRAN_UNBUFFERED_ALL=YES; export GFORTRAN_UNBUFFERED_ALL\n");
 #endif