bk commit into 5.0 tree (svoj:1.1962)

[svoj]

Below is the list of changes that have just been committed into a local
5.0 repository of svoj. When svoj 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.1962 05/06/21 19:45:46 svoj@stripped +6 -0
  WL#2286 - Compile MySQL w/YASSL support
  Fix GCC 4.0 link failure.
  Better CXX_VERSION guessing.

  extra/yassl/taocrypt/src/rsa.cpp
    1.7 05/06/21 19:45:40 svoj@stripped +1 -0
    GCC 4.0 link fix. This file needs __cxa_pure_virtual.

  extra/yassl/taocrypt/src/dsa.cpp
    1.5 05/06/21 19:45:40 svoj@stripped +1 -0
    GCC 4.0 link fix. This file needs __cxa_pure_virtual.

  extra/yassl/taocrypt/src/dh.cpp
    1.5 05/06/21 19:45:40 svoj@stripped +1 -0
    GCC 4.0 link fix. This file needs __cxa_pure_virtual.

  extra/yassl/taocrypt/include/runtime.hpp
    1.7 05/06/21 19:45:40 svoj@stripped +1 -1
    Fix GCC 4.0 link failure. Instruct compiler to always emit __cxa_pure_virtual even if
    it seems to be never used.

  extra/yassl/src/yassl_int.cpp
    1.9 05/06/21 19:45:39 svoj@stripped +1 -0
    GCC 4.0 link fix. This file needs __cxa_pure_virtual.

  configure.in
    1.317 05/06/21 19:45:39 svoj@stripped +3 -3
    Better CXX_VERSION guessing, fix typo: -instance => -instances.

# 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:	svoj
# Host:	svoj.pils.ru
# Root:	/home/svoj/devel/mysql/yassl-mysql-5.0

--- 1.316/configure.in	2005-06-19 21:46:36 +05:00
+++ 1.317/configure.in	2005-06-21 19:45:39 +05:00
@@ -202,7 +202,7 @@
   *)
 CXX_VERSION=`$CXX --version | sed 1q`
 CXX_VERSION=${CXX_VERSION:-`$CXX -V|sed 1q`} # trying harder for Sun and SGI
-CXX_VERSION=${CXX_VERSION:-`$CXX -V 2>&1|sed 1q`} # even harder for Alpha
+CXX_VERSION=${CXX_VERSION:-`$CXX -v 2>&1|sed 1q`} # even harder for Alpha
     ;;
 esac
 if test $? -eq "0"
@@ -377,8 +377,8 @@
   Compaq*)
     CXXFLAGS="$CXXFLAGS -nopt -DEXPLICIT_TEMPLATE_INSTANTIATION"
   ;;
-  Forte*)
-    CXXFLAGS="$CXXFLAGS -instance=explicit -DEXPLICIT_TEMPLATE_INSTANTIATION"
+  *Forte*)
+    CXXFLAGS="$CXXFLAGS -instances=explicit -DEXPLICIT_TEMPLATE_INSTANTIATION"
 esac
 
 # Avoid bug in fcntl on some versions of linux

--- 1.8/extra/yassl/src/yassl_int.cpp	2005-06-19 21:46:37 +05:00
+++ 1.9/extra/yassl/src/yassl_int.cpp	2005-06-21 19:45:39 +05:00
@@ -24,6 +24,7 @@
  * draft along with type conversion functions.
  */
 
+#include "runtime.hpp"
 #include "yassl_int.hpp"
 #include "handshake.hpp"
 #include "timer.hpp"

--- 1.6/extra/yassl/taocrypt/include/runtime.hpp	2005-06-19 21:46:37 +05:00
+++ 1.7/extra/yassl/taocrypt/include/runtime.hpp	2005-06-21 19:45:40 +05:00
@@ -35,7 +35,7 @@
 #include <assert.h>
 
 /* Disallow inline __cxa_pure_virtual() */
-static int __cxa_pure_virtual() __attribute__((noinline));
+static int __cxa_pure_virtual() __attribute__((noinline, used));
 static int __cxa_pure_virtual()
 {
     // oops, pure virtual called!

--- 1.4/extra/yassl/taocrypt/src/dh.cpp	2005-05-31 20:56:25 +05:00
+++ 1.5/extra/yassl/taocrypt/src/dh.cpp	2005-06-21 19:45:40 +05:00
@@ -23,6 +23,7 @@
 /* dh.cpp implements Diffie-Hellman support
 */
 
+#include "runtime.hpp"
 #include "dh.hpp"
 #include "asn.hpp"
 

--- 1.4/extra/yassl/taocrypt/src/dsa.cpp	2005-06-10 20:09:35 +05:00
+++ 1.5/extra/yassl/taocrypt/src/dsa.cpp	2005-06-21 19:45:40 +05:00
@@ -20,6 +20,7 @@
  */
 
 
+#include "runtime.hpp"
 #include "dsa.hpp"
 #include "sha.hpp"
 #include "asn.hpp"

--- 1.6/extra/yassl/taocrypt/src/rsa.cpp	2005-06-10 20:09:36 +05:00
+++ 1.7/extra/yassl/taocrypt/src/rsa.cpp	2005-06-21 19:45:40 +05:00
@@ -21,6 +21,7 @@
 
 /* based on Wei Dai's rsa.cpp from CryptoPP */
 
+#include "runtime.hpp"
 #include "rsa.hpp"
 #include "asn.hpp"
 #include "modarith.hpp"