summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--ChangeLog10
-rw-r--r--generic/tclTomMath.h20
-rwxr-xr-xtools/fix_tommath_h.tcl6
3 files changed, 20 insertions, 16 deletions
diff --git a/ChangeLog b/ChangeLog
index ad21cfb..d86c6aa 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,13 @@
+2007-02-09 Kevin Kenny <kennykb@acm.org>
+
+ * tools/fix_tommath_h.tcl: Added code to patch out a check for
+ __x86_64__ that caused Tommath to use __attributes(TI)__ for
+ the mp_word type. Tetra-int's simply fail on too many gcc-glibc-OS
+ combinations to be ready for shipment today, even if they
+ work for some of us. This change allows reversion of das's change
+ of 2006-08-18 that accomplised the same thing on Darwin.
+ * generic/tclTomMath.h: Regenerated.
+
2007-02-09 Joe Mistachkin <joe@mistachkin.com>
* win/nmakehlp.c: Properly cleanup after nmakehlp, including the
diff --git a/generic/tclTomMath.h b/generic/tclTomMath.h
index c6a2f84..aaa3fe7 100644
--- a/generic/tclTomMath.h
+++ b/generic/tclTomMath.h
@@ -10,7 +10,7 @@
* The library is free for all purposes without any express
* guarantee it works.
*
- * Tom St Denis, tomstdenis@iahu.ca, http://math.libtomcrypt.org
+ * Tom St Denis, tomstdenis@gmail.com, http://math.libtomcrypt.com
*/
#ifndef BN_H_
#define BN_H_
@@ -51,22 +51,11 @@ extern "C" {
/* detect 64-bit mode if possible */
-#if defined(__x86_64__)
+#if defined(NEVER)
#if !(defined(MP_64BIT) && defined(MP_16BIT) && defined(MP_8BIT))
#define MP_64BIT
#endif
#endif
-#if defined(__APPLE__) && defined(__LP64__)
-/*
- * At present, use of 128-bit arithmetic via __attribute__ ((mode(TI)))
- * leads to link errors on Darwin x86_64__ and ppc64. rdar://4685527
- */
-# ifdef HAVE_LP64_MODE_TI
-# define MP_64BIT
-# else
-# undef MP_64BIT
-# endif
-#endif
/* some default configurations.
*
@@ -850,6 +839,7 @@ MODULE_SCOPE const char *mp_s_rmap;
/* $Source: /root/tcl/repos-to-convert/tcl/generic/tclTomMath.h,v $ */
-/* $Revision: 1.8 $ */
-/* $Date: 2006/12/02 01:22:41 $ */
+/* Based on Tom's version 1.8 */
+/* $Revision: 1.9 $ */
+/* $Date: 2007/02/13 03:43:41 $ */
diff --git a/tools/fix_tommath_h.tcl b/tools/fix_tommath_h.tcl
index adad734..2ea3a02 100755
--- a/tools/fix_tommath_h.tcl
+++ b/tools/fix_tommath_h.tcl
@@ -8,7 +8,7 @@
# See the file "license.terms" for information on usage and redistribution
# of this file, and for a DISCLAIMER OF ALL WARRANTIES.
#
-# RCS: @(#) $Id: fix_tommath_h.tcl,v 1.4 2005/12/13 22:43:18 kennykb Exp $
+# RCS: @(#) $Id: fix_tommath_h.tcl,v 1.5 2007/02/13 03:43:41 kennykb Exp $
#
#----------------------------------------------------------------------
@@ -62,6 +62,10 @@ foreach line [split $data \n] {
puts "\#if 0 /* these are macros in tclTomMathDecls.h */"
set eat_endif 1
}
+ {__x86_64__} {
+ puts "[string map {__x86_64__ NEVER} $line]\
+ /* 128-bit ints fail in too many places */"
+ }
default {
puts $line
}