Mercurial > hg > octave-terminal
changeset 5498:3b3e8b7f0800
[project @ 2005-10-17 15:31:06 by jwe]
author | jwe |
---|---|
date | Mon, 17 Oct 2005 15:31:08 +0000 |
parents | 3e44c9564405 |
children | 9e3efbc3070a |
files | ChangeLog Makeconf.in configure.in libcruft/ChangeLog libcruft/lapack/Makefile.in src/ChangeLog src/oct-conf.h.in src/toplev.cc |
diffstat | 8 files changed, 34 insertions(+), 1 deletions(-) [+] |
line wrap: on
line diff
--- a/ChangeLog +++ b/ChangeLog @@ -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.
--- a/Makeconf.in +++ b/Makeconf.in @@ -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}\"|" \
--- a/configure.in +++ b/configure.in @@ -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.)
--- a/libcruft/ChangeLog +++ b/libcruft/ChangeLog @@ -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.
--- a/libcruft/lapack/Makefile.in +++ b/libcruft/lapack/Makefile.in @@ -16,4 +16,6 @@ include $(TOPDIR)/Makeconf +dlamc1.o pic/dlamc1.o: FFLAGS += $(F77_FLOAT_STORE_FLAG) + include ../Makerules
--- a/src/ChangeLog +++ b/src/ChangeLog @@ -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.
--- a/src/oct-conf.h.in +++ b/src/oct-conf.h.in @@ -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