diff options
| author | unknown <msvensson@neptunus.(none)> | 2005-09-01 14:09:23 +0200 |
|---|---|---|
| committer | unknown <msvensson@neptunus.(none)> | 2005-09-01 14:09:23 +0200 |
| commit | 944666ef1d883413fac1721f58e002f3fe83cfc7 (patch) | |
| tree | d8234e00d70ddfb49287ee754cf4b29a64ae777b /BUILD | |
| parent | b5f87344879b501a05758a2c72d38c3f378e9a40 (diff) | |
| parent | e4cfbaed518f98b2ee3f5a9e0a4edef485240221 (diff) | |
| download | mariadb-git-944666ef1d883413fac1721f58e002f3fe83cfc7.tar.gz | |
Merge neptunus.(none):/home/msvensson/mysql/mysql-5.0
into neptunus.(none):/home/msvensson/mysql/bug12526/my50-bug12526
Diffstat (limited to 'BUILD')
| -rwxr-xr-x | BUILD/compile-pentium-icc | 27 | ||||
| -rw-r--r-- | BUILD/compile-pentium-icc-yassl | 24 |
2 files changed, 31 insertions, 20 deletions
diff --git a/BUILD/compile-pentium-icc b/BUILD/compile-pentium-icc index eee8b6c9d90..bf550a4b574 100755 --- a/BUILD/compile-pentium-icc +++ b/BUILD/compile-pentium-icc @@ -8,29 +8,16 @@ path=`dirname $0` CC=icc CXX=icpc CXXLD="$CXX -static-libcxa" -export CC CXX - - -extra_flags="$pentium_cflags $debug_cflags $max_cflags -USAFEMALLOC -UFORCE_INIT_OF_VARS -DHAVE_purify -DMYSQL_SERVER_SUFFIX=-valgrind-max" - -# Disable following warnings as these are generated by header files: -# 161 unrecognized pragma -# 444 destructor for base class xxx is not virtual -# 279 controlling expression is constant -# 810 conversion from ulonglong to ulong with cast -# 981 operands are evaluated in unspecified order -# 1292 warning for unknown 'attribute' options -# 1469 "xxx" clobber ignored -# 1572 floating-point equality and inequality comparisons are unreliable - -# In C++ -# 869 parameter "xxx" was never referenced -# (Problem with virtual functions) -# 874 support for placement delete is disabled +export CC CXX CXXLD c_warnings="" cxx_warnings="" -extra_flags="-O3 -unroll2 -ip -mp -no-gcc -restrict" +extra_flags="$fast_cflags -unroll2 -ip -mp -restrict" + +# Use -no-ipo if you get this error +# IPO link: can not find "-lstdc++_shared" +# icpc: error: problem during multi-file optimization compilation (code 1) +extra_flags="$extra_flags -no-ipo" base_cxxflags="-fno-exceptions -fno-rtti" extra_configs="$pentium_configs $static_link" diff --git a/BUILD/compile-pentium-icc-yassl b/BUILD/compile-pentium-icc-yassl new file mode 100644 index 00000000000..53b191e4db3 --- /dev/null +++ b/BUILD/compile-pentium-icc-yassl @@ -0,0 +1,24 @@ +#! /bin/sh + +path=`dirname $0` +. "$path/SETUP.sh" + +# Note that we can't use ccache with icc as the generated .deps file will +# then contain wrong information +CC=icc +CXX=icpc +CXXLD="$CXX -static-libcxa" +export CC CXX CXXLD + +c_warnings="" +cxx_warnings="" +extra_flags="$fast_cflags -unroll2 -ip -mp -restrict" + +# Use -no-ipo if you get this error +# IPO link: can not find "-lstdc++_shared" +# icpc: error: problem during multi-file optimization compilation (code 1) +extra_flags="$extra_flags -no-ipo" +base_cxxflags="-fno-exceptions -fno-rtti" +extra_configs="$pentium_configs $static_link --with-yassl" + +. "$path/FINISH.sh" |