- Force ffloat-store or mfpmath=sse for libf2c code

git-svn-id: https://openmodelica.org/svn/OpenModelica/trunk@13620 f25d12d1-65f4-0310-ae8a-bbce733d8d8e

Author: sjoelund

SimulationRuntime/c/Makefile.common

@@ -6,10 +6,9 @@
 
 include Makefile.objs
 
-ANSI=# -ansi
-CXXFLAGS := $(CFLAGS) -mfpmath=sse -Wall $(ANSI) $(EXTRA_CFLAGS) -I. -I$(UTILPATH)
-CPPFLAGS := $(CFLAGS) -mfpmath=sse -Wall $(ANSI) $(EXTRA_CFLAGS) -I. -I$(UTILPATH)
-CFLAGS := $(CFLAGS) -mfpmath=sse -Wall $(ANSI) -pedantic -I. -I$(METAPATH) -I$(METAPATH)gc $(EXTRA_CFLAGS)
+CPPFLAGS = -I. -I$(UTILPATH) -I. -I$(METAPATH) -I$(METAPATH)gc
+CFLAGS = $(CPPFLAGS) $(CONFIG_CFLAGS) -Wall -pedantic $(EXTRA_CFLAGS)
+CXXFLAGS = $(CFLAGS)
 FFLAGS  = -O -fexceptions
 # P.A: before, g77 had -O3 or -O2 but that caused a bug in DDASRT, giving infinite loop.
 
@@ -96,10 +95,10 @@ $(UTILOBJSPATH):%.o: %.c $(UTILHFILESPATH) $(COMMON_HEADERS)
 $(MATHOBJSPATH):%.o: %.c $(MATHHFILESPATH) $(COMMON_HEADERS)
 	$(CC) -c $(CFLAGS) -o $@ $< -I$(MATHPATH) -I$(UTILPATH)
 
-$(SOLVEROBJSPATH):%.o: %.c $(SOLVERHFILESPATH) $(INITIALIZATIONHFILESPATH) $(COMMON_HEADERS)
-	$(CC) -c $(CFLAGS) -o $@ $< -I$(SOLVERPATH) -I$(INITIALIZATIONPATH) -I$(SIMPATH) -I$(MATHPATH) -I$(UTILPATH)
-
-$(INITIALIZATIONOBJSPATH):%.o: %.c $(SOLVERHFILESPATH) $(INITIALIZATIONHFILESPATH) $(COMMON_HEADERS)
+$(SOLVEROBJSPATH):%.o: %.c $(SOLVERHFILESPATH) $(INITIALIZATIONHFILESPATH) $(COMMON_HEADERS)
+	$(CC) -c $(CFLAGS) -o $@ $< -I$(SOLVERPATH) -I$(INITIALIZATIONPATH) -I$(SIMPATH) -I$(MATHPATH) -I$(UTILPATH)
+
+$(INITIALIZATIONOBJSPATH):%.o: %.c $(SOLVERHFILESPATH) $(INITIALIZATIONHFILESPATH) $(COMMON_HEADERS)
 	$(CC) -c $(CFLAGS) -o $@ $< -I$(SOLVERPATH) -I$(INITIALIZATIONPATH) -I$(SIMPATH) -I$(MATHPATH) -I$(UTILPATH)
 
 $(RESULTSOBJSPATH):%.o: $(RESULTSFILESPATH) $(COMMON_HEADERS)

SimulationRuntime/c/Makefile.in

@@ -10,9 +10,9 @@ builddir_lib=$(top_builddir)/build/lib/omc
 builddir_inc=$(top_builddir)/build/include/omc
 
 AR = sh ar.sh
-CC := @CC@
-CXX := @CXX@
-CFLAGS := @CFLAGS@ @IPOPT_CFLAGS@
+CC = @CC@
+CXX = @CXX@
+CONFIG_CFLAGS = @CFLAGS@ @IPOPT_CFLAGS@
 
 LIBMAKEFILE = Makefile
 INTERACTIVELIBS = "-lpthread"

configure.in

@@ -50,6 +50,7 @@ AC_SUBST(PYTHON_INTERFACE)
 AC_SUBST(WITH_SUNDIALS)
 AC_SUBST(WITH_IPOPT)
 AC_SUBST(OMNOTEBOOK)
+AC_SUBST(FPMATHFORTRAN)
 
 FINAL_MESSAGES="\nConfigured OpenModelica successfully using the following options:"
 
@@ -65,6 +66,13 @@ fi
 AC_PREFIX_DEFAULT($PREFIX)
 prefix=$PREFIX
 
+dnl Checks for programs.
+AC_PROG_CC
+AC_PROG_CXX
+AC_PROG_CPP
+AC_PROG_MAKE_SET
+AC_PROG_LEX
+
 dnl Disables the default CFLAGS="-g -O2"
 if test -z "$CFLAGS"; then
 if  test "Darwin" = `uname`; then
@@ -90,26 +98,14 @@ fi
 fi
 
 dnl Simulations spin forever unless -msse2 -mfpmath=sse is set
-dnl Or if -ffloat-store  is set
-dnl With the new solver interface, this seems to work even with -mpfpath=387
-#AC_MSG_CHECKING([for floating point bugs])
-#if echo $CFLAGS | grep -q -- -ffloat-store; then
-#  AC_MSG_RESULT([have -ffloat-store])
-#elif echo $CFLAGS | grep -q -- -msse2 && echo $CFLAGS | grep -q -- -mfpmath=sse; then
-#  AC_MSG_RESULT([have SSE2])
-#else
-#  CFLAGS+=" -msse2 -mfpmath=sse"
-#  AC_MSG_RESULT([adding -msse2 -mfpmath=sse])
-#fi
 
-fi # End x86-specific CFLAGS
+CFLAGS_BEFORE=$CFLAGS
+CFLAGS="-mfpmath=sse -Werror"
+AC_MSG_CHECKING([for floating point bugs])
+AC_TRY_LINK([int abc() {}], [abc();], [AC_MSG_RESULT([force SSE2]); FPMATHFORTRAN="-msse -mfpmath=sse"], [AC_MSG_RESULT([no]); FPMATHFORTRAN=-ffloat-store])
+CFLAGS=$CFLAGS_BEFORE
 
-dnl Checks for programs.
-AC_PROG_CC
-AC_PROG_CXX
-AC_PROG_CPP
-AC_PROG_MAKE_SET
-AC_PROG_LEX
+fi # End x86-specific CFLAGS
 
 dnl check for environment variables