MySQL Lists are EOL. Please join:

List:Internals« Previous MessageNext Message »
From:msvensson Date:September 15 2005 6:59am
Subject:bk commit into 5.0 tree (msvensson:1.1953) BUG#12526
View as plain text  
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.1953 05/09/15 08:59:29 msvensson@neptunus.(none) +2 -0
  Bug #12526 yassl: Crashes in "integer.cpp"
   - Disable inlining in integer.cp for sparc solaris Cun C++ 5.6

  extra/yassl/taocrypt/src/Makefile.am
    1.7 05/09/15 08:59:25 msvensson@neptunus.(none) +5 -2
    Compile integer.cpp into a separate lib in order to use special CXXFLAGS
    Add the integer.cpp lib to libtaocrypt.la

  config/ac-macros/yassl.m4
    1.5 05/09/15 08:59:25 msvensson@neptunus.(none) +11 -0
    Detect sparc Solaris + Sun C++ 5.6 and disable inlining for integer.cpp

# 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.4/config/ac-macros/yassl.m4	2005-06-18 16:10:42 +02:00
+++ 1.5/config/ac-macros/yassl.m4	2005-09-15 08:59:25 +02:00
@@ -20,6 +20,17 @@
     -L\$(top_builddir)/extra/yassl/taocrypt/src -ltaocrypt"
     openssl_includes="-I\$(top_srcdir)/extra/yassl/include"
     AC_DEFINE([HAVE_OPENSSL], [1], [Defined by configure. Using yaSSL for OpenSSL emulation.])
+
+    # System specific checks
+    yassl_integer_extra_cxxflags=""
+    case $SYSTEM_TYPE--$CXX_VERSION in
+       sparc*solaris*--*Sun*C++*5.6*)
+	# Disable inlining when compiling taocrypt/src/integer.cpp
+	yassl_integer_extra_cxxflags="+d"
+        ;;
+    esac
+   AC_SUBST([yassl_integer_extra_cxxflags])
+
   else
     yassl_dir=""
     AC_MSG_RESULT(no)

--- 1.6/extra/yassl/taocrypt/src/Makefile.am	2005-08-11 21:26:13 +02:00
+++ 1.7/extra/yassl/taocrypt/src/Makefile.am	2005-09-15 08:59:25 +02:00
@@ -1,9 +1,12 @@
 INCLUDES = -I../include -I../../mySTL
 
-noinst_LTLIBRARIES = libtaocrypt.la
+noinst_LTLIBRARIES = libtaocrypt.la libtaoint.la
 libtaocrypt_la_SOURCES  = aes.cpp aestables.cpp algebra.cpp arc4.cpp asn.cpp \
-	coding.cpp dh.cpp des.cpp dsa.cpp file.cpp hash.cpp integer.cpp \
+	coding.cpp dh.cpp des.cpp dsa.cpp file.cpp hash.cpp \
 	md2.cpp md5.cpp misc.cpp random.cpp ripemd.cpp rsa.cpp sha.cpp \
 	template_instnt.cpp
+libtaocrypt_la_LIBADD = libtaoint.la
+libtaoint_la_SOURCES = integer.cpp
+libtaoint_la_CXXFLAGS = @yassl_integer_extra_cxxflags@
 EXTRA_DIST = ../include/*.hpp
 AM_CXXFLAGS = -DYASSL_PURE_C
Thread
bk commit into 5.0 tree (msvensson:1.1953) BUG#12526msvensson15 Sep