diff options
author | schnetter <schnetter@17b73243-c579-4c4c-a9d2-2d5706c11dac> | 2006-01-24 15:08:03 +0000 |
---|---|---|
committer | schnetter <schnetter@17b73243-c579-4c4c-a9d2-2d5706c11dac> | 2006-01-24 15:08:03 +0000 |
commit | 52aef9f23cdf65315b08625c6915c3b4375c6e81 (patch) | |
tree | 79d43f21a4f0615e9e4e3c348e3f7084beae6a6b /lib | |
parent | 90cfb87534f2c1e29898ecae45a76cffc6a61d5f (diff) |
When setting F77 to F90 while configuring, we recently also started
setting F77FLAGS to F90FLAGS. Since this change, compiling F77 code
with the IBM Fortran compiler seems to be broken. The compiler does
not recognise any more that F77 files are in fixed format. This
problem has been extensively discussed on the developers' list in
October 2005. This patch corrects that problem.
Some known-architecture files produce makefile fragments that add, at
run time, additional flags to F90FLAGS to set the source code form
correctly (fixed or free format). These fragments need to add the
same flags to F77FLAGS as well. This concerns the architectures AIX,
BGL, and Darwin.
git-svn-id: http://svn.cactuscode.org/flesh/trunk@4238 17b73243-c579-4c4c-a9d2-2d5706c11dac
Diffstat (limited to 'lib')
-rw-r--r-- | lib/make/known-architectures/aix | 5 | ||||
-rw-r--r-- | lib/make/known-architectures/bgl | 4 | ||||
-rw-r--r-- | lib/make/known-architectures/darwin | 9 |
3 files changed, 12 insertions, 6 deletions
diff --git a/lib/make/known-architectures/aix b/lib/make/known-architectures/aix index 485d8688..53458404 100644 --- a/lib/make/known-architectures/aix +++ b/lib/make/known-architectures/aix @@ -51,7 +51,7 @@ else # Fortran compilers : ${F90FLAGS="-q$AIX_BITS -qmaxmem=-1 -qspill=10000"} - : ${F77FLAGS="-q$AIX_BITS -qmaxmem=-1 -qfixed"} + : ${F77FLAGS="-q$AIX_BITS -qmaxmem=-1"} : ${F90_OPTIMISE_FLAGS='-O5'} : ${F77_OPTIMISE_FLAGS='-O5'} : ${F90_DEBUG_FLAGS='-g'} @@ -59,8 +59,11 @@ else : ${F90_SUFFIX='f'} CCTK_WriteLine make.arch.defn 'F90FLAGS += $(AIX_$(subst .,,$(suffix $<))_FLAGS)' + CCTK_WriteLine make.arch.defn 'F77FLAGS += $(AIX_$(subst .,,$(suffix $<))_FLAGS)' CCTK_WriteLine make.arch.defn 'AIX_F90_FLAGS =' CCTK_WriteLine make.arch.defn 'AIX_f90_FLAGS =' + CCTK_WriteLine make.arch.defn 'AIX_F77_FLAGS = -qfixed' + CCTK_WriteLine make.arch.defn 'AIX_f77_FLAGS = -qfixed' CCTK_WriteLine make.arch.defn 'AIX_F_FLAGS = -qfixed' CCTK_WriteLine make.arch.defn 'AIX_f_FLAGS = -qfixed' FPP='$(PERL) $(CCTK_HOME)/lib/sbin/cpp.pl' diff --git a/lib/make/known-architectures/bgl b/lib/make/known-architectures/bgl index 2a31c834..d3589930 100644 --- a/lib/make/known-architectures/bgl +++ b/lib/make/known-architectures/bgl @@ -6,7 +6,7 @@ # @desc # Known-architectures file for IBM Bluegene/L systems # @enddesc -# @version $Header: /mnt/data2/cvs2svn/cvs-repositories/Cactus/lib/make/known-architectures/bgl,v 1.2 2006-01-22 17:35:46 goodale Exp $ +# @version $Header: /mnt/data2/cvs2svn/cvs-repositories/Cactus/lib/make/known-architectures/bgl,v 1.3 2006-01-24 15:08:03 schnetter Exp $ # @@*/ if test "$CCTK_CONFIG_STAGE" = 'preferred-compilers' ; then @@ -43,7 +43,7 @@ else cross_compiling=yes # Fortran compilers : ${F90FLAGS="-qmaxmem=64000"} - : ${F77FLAGS="-qmaxmem=64000 -qfixed"} + : ${F77FLAGS="-qmaxmem=64000"} : ${F90_OPTIMISE_FLAGS='-O2 -qarch=440'} : ${F77_OPTIMISE_FLAGS='-O2 -qarch=440'} : ${F90_DEBUG_FLAGS='-g'} diff --git a/lib/make/known-architectures/darwin b/lib/make/known-architectures/darwin index c2344221..16c728fa 100644 --- a/lib/make/known-architectures/darwin +++ b/lib/make/known-architectures/darwin @@ -6,7 +6,7 @@ # @desc # Known architecture stuff for MacOS X (Darwin) # @enddesc -# @version $Header: /mnt/data2/cvs2svn/cvs-repositories/Cactus/lib/make/known-architectures/darwin,v 1.11 2004-03-30 00:07:46 goodale Exp $ +# @version $Header: /mnt/data2/cvs2svn/cvs-repositories/Cactus/lib/make/known-architectures/darwin,v 1.12 2006-01-24 15:08:03 schnetter Exp $ # @@*/ if test "$CCTK_CONFIG_STAGE" = 'preferred-compilers' ; then @@ -170,15 +170,18 @@ else fi # : ${LIBDIRS='/opt/ibmcmp/lib'} # : ${ARFLAGS='-rucs'} - : ${F90FLAGS=' -qspill=10000 -qmaxmem=-1 -qnullterm -qsuffix=f=f'} - : ${F77FLAGS='-qfixed -qmaxmem=-1 -qnullterm -qsuffix=f=f'} + : ${F90FLAGS='-qspill=10000 -qmaxmem=-1 -qnullterm -qsuffix=f=f'} + : ${F77FLAGS='-qmaxmem=-1 -qnullterm -qsuffix=f=f'} : ${F90_OPTIMISE_FLAGS='-O5'} : ${F77_OPTIMISE_FLAGS='-O5'} : ${F90_SUFFIX='f'} CCTK_WriteLine make.arch.defn 'F90FLAGS += $(DARWIN_$(subst .,,$(suffix $<))_FLAGS)' + CCTK_WriteLine make.arch.defn 'F77FLAGS += $(DARWIN_$(subst .,,$(suffix $<))_FLAGS)' CCTK_WriteLine make.arch.defn 'DARWIN_F90_FLAGS =' CCTK_WriteLine make.arch.defn 'DARWIN_f90_FLAGS =' + CCTK_WriteLine make.arch.defn 'DARWIN_F77_FLAGS = -qfixed' + CCTK_WriteLine make.arch.defn 'DARWIN_f77_FLAGS = -qfixed' CCTK_WriteLine make.arch.defn 'DARWIN_F_FLAGS = -qfixed' CCTK_WriteLine make.arch.defn 'DARWIN_f_FLAGS = -qfixed' ;; |