# HG changeset patch
# User jwe
# Date 1129563068 0
# Node ID 3b3e8b7f0800da62a4890136bbacacaa1eb14544
# Parent  3e44c9564405a6de3f503727927d721b838e0131
[project @ 2005-10-17 15:31:06 by jwe]

diff -r 3e44c9564405 -r 3b3e8b7f0800 ChangeLog
--- a/ChangeLog	Fri Oct 14 21:02:06 2005 +0000
+++ b/ChangeLog	Mon Oct 17 15:31:08 2005 +0000
@@ -1,3 +1,11 @@
+2005-10-17  John W. Eaton  <jwe@octave.org>
+
+	* configure.in (F77_FFLOAT_STORE_FLAG):
+	Check for -ffloat-store option for Fortran compiler and set
+	F77_FLOAT_STORE_FLAG if it works.
+	* Makeconf.in: Substitute it here.
+	(do-subst-config-vals): Substitute OCTAVE_CONF_F77_FLOAT_STORE_FLAG.
+
 2005-10-14  John W. Eaton  <jwe@octave.org>
 
 	* aclocal.m4 (OCTAVE_PROG_PYTHON): New macro.
diff -r 3e44c9564405 -r 3b3e8b7f0800 Makeconf.in
--- a/Makeconf.in	Fri Oct 14 21:02:06 2005 +0000
+++ b/Makeconf.in	Mon Oct 17 15:31:08 2005 +0000
@@ -92,6 +92,7 @@
 FFLAGS = @FFLAGS@
 FPICFLAG = @FPICFLAG@
 ALL_FFLAGS = $(FFLAGS)
+F77_FLOAT_STORE_FLAG = @F77_FLOAT_STORE_FLAG@
 
 # cc and associated flags.
 
@@ -440,6 +441,7 @@
   -e "s|%OCTAVE_CONF_F2C%|\"${F2C}\"|" \
   -e "s|%OCTAVE_CONF_F2CFLAGS%|\"${F2CFLAGS}\"|" \
   -e "s|%OCTAVE_CONF_F77%|\"${F77}\"|" \
+  -e "s|%OCTAVE_CONF_F77_FLOAT_STORE_FLAG%|\"${F77_FLOAT_STORE_FLAG}\"|" \
   -e "s|%OCTAVE_CONF_FC%|\"${FC}\"|" \
   -e "s|%OCTAVE_CONF_FFLAGS%|\"${FFLAGS}\"|" \
   -e "s|%OCTAVE_CONF_FFTW_LIBS%|\"${FFTW_LIBS}\"|" \
diff -r 3e44c9564405 -r 3b3e8b7f0800 configure.in
--- a/configure.in	Fri Oct 14 21:02:06 2005 +0000
+++ b/configure.in	Mon Oct 17 15:31:08 2005 +0000
@@ -29,7 +29,7 @@
 EXTERN_CXXFLAGS="$CXXFLAGS"
 
 AC_INIT
-AC_REVISION($Revision: 1.484 $)
+AC_REVISION($Revision: 1.485 $)
 AC_PREREQ(2.57)
 AC_CONFIG_SRCDIR([src/octave.cc])
 AC_CONFIG_HEADER(config.h)
@@ -706,6 +706,12 @@
 AC_SUBST(FC)
 AC_SUBST_FILE(f77_rules_frag)
 
+OCTAVE_F77_FLAG(-ffloat-store, [
+AC_MSG_RESULT([setting F77_FLOAT_STORE_FLAG to -ffloat-store])
+F77_FLOAT_STORE_FLAG=-ffloat-store
+AC_SUBST(F77_FLOAT_STORE_FLAG)
+])
+
 ### Checks for BLAS and LAPACK libraries:
 # (Build subdirectories of libcruft if they aren't found on the system.)
 
diff -r 3e44c9564405 -r 3b3e8b7f0800 libcruft/ChangeLog
--- a/libcruft/ChangeLog	Fri Oct 14 21:02:06 2005 +0000
+++ b/libcruft/ChangeLog	Mon Oct 17 15:31:08 2005 +0000
@@ -1,3 +1,8 @@
+2005-10-17  John W. Eaton  <jwe@octave.org>
+
+	* lapack/Makefile.in (dlamc1.o pic/dlamc1.o):
+	Add $(F77_FLOAT_STORE_FLAG) to FFLAGS.
+
 2005-09-23  John W. Eaton  <jwe@octave.org>
 
 	* misc/machar.c: Restore test code.
diff -r 3e44c9564405 -r 3b3e8b7f0800 libcruft/lapack/Makefile.in
--- a/libcruft/lapack/Makefile.in	Fri Oct 14 21:02:06 2005 +0000
+++ b/libcruft/lapack/Makefile.in	Mon Oct 17 15:31:08 2005 +0000
@@ -16,4 +16,6 @@
 
 include $(TOPDIR)/Makeconf
 
+dlamc1.o pic/dlamc1.o: FFLAGS += $(F77_FLOAT_STORE_FLAG)
+
 include ../Makerules
diff -r 3e44c9564405 -r 3b3e8b7f0800 src/ChangeLog
--- a/src/ChangeLog	Fri Oct 14 21:02:06 2005 +0000
+++ b/src/ChangeLog	Mon Oct 17 15:31:08 2005 +0000
@@ -1,3 +1,8 @@
+2005-10-17  John W. Eaton  <jwe@octave.org>
+
+	* oct-conf.h.in (OCTAVE_CONF_F77_FLOAT_STORE_FLAG): Substitute
+	OCTAVE_CONF_F77_FLOAT_STORE_FLAG here.
+
 2005-10-14  John W. Eaton  <jwe@octave.org>
 
 	* mk-errno-list: New script.
diff -r 3e44c9564405 -r 3b3e8b7f0800 src/oct-conf.h.in
--- a/src/oct-conf.h.in	Fri Oct 14 21:02:06 2005 +0000
+++ b/src/oct-conf.h.in	Mon Oct 17 15:31:08 2005 +0000
@@ -129,6 +129,10 @@
 #define OCTAVE_CONF_F77 %OCTAVE_CONF_F77%
 #endif
 
+#ifndef OCTAVE_CONF_F77_FLOAT_STORE_FLAG
+#define OCTAVE_CONF_F77_FLOAT_STORE_FLAG %OCTAVE_CONF_F77_FLOAT_STORE_FLAG%
+#endif
+
 #ifndef OCTAVE_CONF_FC
 #define OCTAVE_CONF_FC %OCTAVE_CONF_FC%
 #endif
diff -r 3e44c9564405 -r 3b3e8b7f0800 src/toplev.cc
--- a/src/toplev.cc	Fri Oct 14 21:02:06 2005 +0000
+++ b/src/toplev.cc	Mon Oct 17 15:31:08 2005 +0000
@@ -657,6 +657,7 @@
       "F2C", OCTAVE_CONF_F2C,
       "F2CFLAGS", OCTAVE_CONF_F2CFLAGS,
       "F77", OCTAVE_CONF_F77,
+      "F77_FLOAT_STORE_FLAG", OCTAVE_CONF_F77_FLOAT_STORE_FLAG,
       "FC", OCTAVE_CONF_FC,
       "FFLAGS", OCTAVE_CONF_FFLAGS,
       "FFTW_LIBS", OCTAVE_CONF_FFTW_LIBS,