A
lgorithmique
N
umérique
D
istribuée
Public GIT Repository
projects
/
simgrid.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Sanitize a bit the <foreach> handling (cosmetics, no bug fixed so far)
[simgrid.git]
/
acmacro
/
compiler-flags.m4
diff --git
a/acmacro/compiler-flags.m4
b/acmacro/compiler-flags.m4
index
289fa44
..
9910dfd
100644
(file)
--- a/
acmacro/compiler-flags.m4
+++ b/
acmacro/compiler-flags.m4
@@
-35,7
+35,8
@@
AC_DEFUN([SG_COMPILE_FLAGS],[
fi;;
esac
fi;;
esac
- if test "x$enable_compile_warnings" = "xyes" ; then
+ if test "x$enable_compile_warnings" = "xyes" ||
+ test "x$force_compile_warnings" = "xyes"; then
AC_MSG_CHECKING(the warning flags for this compiler)
warnCFLAGS=
if test "x$CC" = "xgcc" || test "x$GCC" = "xyes" ; then
AC_MSG_CHECKING(the warning flags for this compiler)
warnCFLAGS=
if test "x$CC" = "xgcc" || test "x$GCC" = "xyes" ; then
@@
-49,14
+50,12
@@
AC_DEFUN([SG_COMPILE_FLAGS],[
## -Wformat=2 chokes on the snprintf replacement because the format is passed to real sprintf
## -Wshadow chokes on try{ try{} } constructs
## -Wformat=2 chokes on the snprintf replacement because the format is passed to real sprintf
## -Wshadow chokes on try{ try{} } constructs
- if test "x$enable_compile_warnings" = "xyes"; then
- warnCFLAGS=`echo $warnCFLAGS -Wmissing-prototypes -Wmissing-declarations \
+ warnCFLAGS=`echo $warnCFLAGS -Wmissing-prototypes -Wmissing-declarations \
-Wpointer-arith -Wchar-subscripts -Wcomment -Wformat -Wwrite-strings \
-Wpointer-arith -Wchar-subscripts -Wcomment -Wformat -Wwrite-strings \
- -Wno-unused-function -Wno-strict-aliasing -Wno-format-nonliteral \
+ -Wno-unused-function
-Wno-unused-parameter
-Wno-strict-aliasing -Wno-format-nonliteral \
-Werror \
| sed 's/ +/ /g'`
# -Wno-unused-variable -Wno-unused-label
-Werror \
| sed 's/ +/ /g'`
# -Wno-unused-variable -Wno-unused-label
- fi
fi
AC_MSG_RESULT($warnCFLAGS)
# placed before since gcc remembers the last one on conflict
fi
AC_MSG_RESULT($warnCFLAGS)
# placed before since gcc remembers the last one on conflict
@@
-72,7
+71,8
@@
AC_DEFUN([SG_COMPILE_FLAGS],[
*-O*) ;;
*) optCFLAGS="$optCFLAGS -O3" ;;
esac
*-O*) ;;
*) optCFLAGS="$optCFLAGS -O3" ;;
esac
- optCFLAGS="$optCFLAGS -finline-functions -ffast-math -funroll-loops -fno-strict-aliasing"
+ optCFLAGS="$optCFLAGS -finline-functions -funroll-loops -fno-strict-aliasing"
+ # now that surf uses advanced maths in lagrangian, -ffast-math do break things
GCC_VER=`gcc --version | head -n 1 | sed 's/^[^0-9]*\([^ ]*\).*$/\1/'`
GCC_VER_MAJ=`echo $GCC_VER | sed 's/^\(.\).*$/\1/'`
GCC_VER=`gcc --version | head -n 1 | sed 's/^[^0-9]*\([^ ]*\).*$/\1/'`
GCC_VER_MAJ=`echo $GCC_VER | sed 's/^\(.\).*$/\1/'`
@@
-91,6
+91,8
@@
AC_DEFUN([SG_COMPILE_FLAGS],[
if test "x$cflags_set" != "xyes" ; then
CFLAGS="$optCFLAGS $CFLAGS"
fi
if test "x$cflags_set" != "xyes" ; then
CFLAGS="$optCFLAGS $CFLAGS"
fi
+ else
+ CFLAGS="$CFLAGS -O0"
fi
if test x$lt_cv_prog_gnu_ld = xyes ; then
fi
if test x$lt_cv_prog_gnu_ld = xyes ; then