--- comp.orig	2018-09-30 20:45:26.000000000 -0700
+++ comp	2018-11-03 10:04:45.000000000 -0700
@@ -2284,7 +2284,7 @@
 #
 #        see the 'linux64' section's notes about gfortran.
 #
-   case gfortran:
+   case *gfortran*:
 #
       set OPT='-O2'
       if ($MODULE == zheev)  set OPT='-O0'  # defensive compiling
@@ -2331,11 +2331,28 @@
          case 5.1:
          case 5.2:
          case 5.3:
+         case 5.4:
+         case 5.5:
             if ($MODULE == cosmo)  set OPT='-O0'
             if ($MODULE == dcscf)  set OPT='-O0'
             if ($MODULE == tddgrd) set OPT='-O0'
             set EXTRAOPT="$EXTRAOPT -w -fno-aggressive-loop-optimizations"
             breaksw
+         case 6.1:
+         case 6.2:
+         case 6.3:
+         case 6.4:
+            set EXTRAOPT="$EXTRAOPT -w -fno-aggressive-loop-optimizations -funconstrained-commons"
+            breaksw
+         case 7.1:
+         case 7.2:
+         case 7.3:
+            set EXTRAOPT="$EXTRAOPT -w -fno-aggressive-loop-optimizations -funconstrained-commons"
+            breaksw
+         case 8.1:
+         case 8.2:
+            set EXTRAOPT="$EXTRAOPT -w -fno-aggressive-loop-optimizations -funconstrained-commons"
+            breaksw
          default:
             echo Unrecognized gfortran version for mac32
             exit 4
@@ -2343,7 +2360,7 @@
       endsw
 
       set echo
-      gfortran -c $OPT $EXTRAOPT $MODULE_F
+      $GMS_FORTRAN -c -m32 $OPT $EXTRAOPT $MODULE_F
       unset echo
       breaksw
 
@@ -2401,7 +2418,7 @@
 #
 #        see the 'linux64' section's notes about gfortran.
 #
-   case gfortran:
+   case *gfortran*:
 #
       set OPT='-O2'
       if ($MODULE == zheev)  set OPT='-O0'  # defensive compiling
@@ -2477,7 +2494,7 @@
       endsw
 
       set echo
-      gfortran -c -m64 -fdefault-integer-8 $OPT $EXTRAOPT $MODULE_F
+      $GMS_FORTRAN -c -m64 -fdefault-integer-8 $OPT $EXTRAOPT $MODULE_F
       unset echo
       breaksw