Merge neptunus.(none):/home/msvensson/mysql/mysql-5.0 (944666ef) · Commits · Software / OSDI20 Artifacts / mariadb

BUILD/compile-pentium-icc

+7 −20

Original line number	Diff line number	Diff line
		@@ -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"

0 → 100644

+24 −0

Original line number	Diff line number	Diff line
		#! /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"

+7 −0

Original line number	Diff line number	Diff line
		@@ -96,6 +96,13 @@ public:
		#endif


		// Disable assmebler when compiling with icc
		// Temporary workaround for bug12717
		#if defined(__INTEL_COMPILER)
		#define TAOCRYPT_DISABLE_X86ASM
		#endif



		// CodeWarrior defines _MSC_VER
		#if !defined(TAOCRYPT_DISABLE_X86ASM) && ((defined(_MSC_VER) && \