Changeset: b5f6614dc983 for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=b5f6614dc983
Modified Files:
configure.ag
Branch: default
Log Message:
Merge with Oct2014 branch.
diffs (28 lines):
diff --git a/configure.ag b/configure.ag
--- a/configure.ag
+++ b/configure.ag
@@ -662,7 +662,10 @@ yes-*-*)
;;
-*icc*-linux*|-*ecc*-linux*)
dnl Intel ([ie]cc/[ie]cpc on Linux)
- LDFLAGS="$LDFLAGS -i_dynamic"
+ case $icc_ver in
+ ?.*) LDFLAGS="$LDFLAGS -i_dynamic";;
+ ??.*) LDFLAGS="$LDFLAGS -shared-intel";;
+ esac
dnl Let warning #140 "too many arguments in function call"
dnl become an error to make configure tests work properly.
CFLAGS="$CFLAGS -we140"
@@ -1045,10 +1048,10 @@ if test "x$enable_optimize" = xyes; then
dnl We need to use -mp instead of -mp1 as otherwise nextafter()
& nextafterf() do not work correctly for 0
x86_64-*-*-11.*) CFLAGS="$CFLAGS -mp -O3 -restrict -unroll
-axSSE4.2 ";;
- dnl -mp does no longer exist with icc 15; not tested whether we
can use -mp1, again ...
+ dnl -mp does no longer exist with icc 15; using -mieee-fp,
instead.
dnl adding -axSSE4.2 (or even -axCORE-AVX512) results in errors
like
dnl "error: ODBCFetch has been targeted for automatic cpu
dispatch" ...
- x86_64-*-*-15.*) CFLAGS="$CFLAGS -O3 -restrict -unroll
-no-inline-max-size -no-inline-max-total-size";;
+ x86_64-*-*-15.*) CFLAGS="$CFLAGS -mieee-fp -O3 -restrict -unroll
-no-inline-max-size -no-inline-max-total-size -xHost -xHOST";;
i*86-*-*-8.*) CFLAGS="$CFLAGS -mp1 -O3 -restrict -unroll
-tpp6 -axKWNPB";;
i*86-*-*-9.*) CFLAGS="$CFLAGS -mp1 -O3 -restrict -unroll
-tpp6 -axKWNPB";;
_______________________________________________
checkin-list mailing list
checkin-list@monetdb.org
https://www.monetdb.org/mailman/listinfo/checkin-list
