bk commit into 5.0 tree (msvensson:1.1983) BUG#12717

[msvensson]

Below is the list of changes that have just been committed into a local
5.0 repository of msvensson. When msvensson does a push these changes will
be propagated to the main repository and, within 24 hours after the
push, to the public repository.
For information on how to access the public repository
see http://dev.mysql.com/doc/mysql/en/installing-source-tree.html

ChangeSet
  1.1983 05/09/01 14:07:45 msvensson@neptunus.(none) +3 -0
  Bug #12717  	yassl: Crashes in "integer.cpp" when compiled with icc
   - Temporary fix, disable x86 assembler.

  BUILD/compile-pentium-icc-yassl
    1.1 05/09/01 14:07:41 msvensson@neptunus.(none) +24 -0
    New BitKeeper file ``BUILD/compile-pentium-icc-yassl''

  extra/yassl/taocrypt/include/misc.hpp
    1.7 05/09/01 14:07:41 msvensson@neptunus.(none) +7 -0
    Disable x86 assembler  when compiling with icc 

  BUILD/compile-pentium-icc
    1.2 05/09/01 14:07:41 msvensson@neptunus.(none) +7 -20
    Cleanup build script for icc

  BUILD/compile-pentium-icc-yassl
    1.0 05/09/01 14:07:41 msvensson@neptunus.(none) +0 -0
    BitKeeper file /home/msvensson/mysql/bug12526/my50-bug12526/BUILD/compile-pentium-icc-yassl

# This is a BitKeeper patch.  What follows are the unified diffs for the
# set of deltas contained in the patch.  The rest of the patch, the part
# that BitKeeper cares about, is below these diffs.
# User:	msvensson
# Host:	neptunus.(none)
# Root:	/home/msvensson/mysql/bug12526/my50-bug12526

--- 1.1/BUILD/compile-pentium-icc	2005-05-18 18:00:15 +02:00
+++ 1.2/BUILD/compile-pentium-icc	2005-09-01 14:07:41 +02:00
@@ -8,29 +8,16 @@
 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"
 
--- New file ---
+++ BUILD/compile-pentium-icc-yassl	05/09/01 14:07:41
#! /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"


--- 1.6/extra/yassl/taocrypt/include/misc.hpp	2005-06-16 13:35:02 +02:00
+++ 1.7/extra/yassl/taocrypt/include/misc.hpp	2005-09-01 14:07:41 +02:00
@@ -96,6 +96,13 @@
 #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) && \