Re-base to core-8-branch

26 files changed, 32 insertions, 26 deletions

diff --git a/.fossil-settings/binary-glob b/.fossil-settings/binary-glob
index 2a205a1..a6eec26 100644
--- a/.fossil-settings/binary-glob
+++ b/.fossil-settings/binary-glob
@@ -1,4 +1,22 @@
+compat/zlib/win32/zdll.lib
+compat/zlib/win32/zlib1.dll
+compat/zlib/win64/zdll.lib
+compat/zlib/win64/zlib1.dll
+compat/zlib/win64/libz.dll.a
+compat/zlib/zlib.3.pdf
+compat/zlib/win32/zdll.lib
+compat/zlib/win32/zlib1.dll
+compat/zlib/win64/zdll.lib
+compat/zlib/win64/zlib1.dll
+compat/zlib/win64/libz.dll.a
+compat/zlib/zlib.3.pdf
+libtommath/win32/tommath.lib
+libtommath/win32/libtommath.dll
+libtommath/win64/tommath.lib
+libtommath/win64/libtommath.dll
+libtommath/win64/libtommath.dll.a
 *.a
+*.bmp
 *.dll
 *.exe
 *.gif
diff --git a/generic/tclBasic.c b/generic/tclBasic.c
index 59f656a..05999c6 100644
--- a/generic/tclBasic.c
+++ b/generic/tclBasic.c
@@ -20,7 +20,7 @@
 #include "tclInt.h"
 #include "tclOOInt.h"
 #include "tclCompile.h"
-#include "tommath.h"
+#include "tclTomMath.h"
 #include <math.h>
 #include <assert.h>
 
diff --git a/generic/tclBinary.c b/generic/tclBinary.c
index e28535e..ea8e204 100644
--- a/generic/tclBinary.c
+++ b/generic/tclBinary.c
@@ -12,7 +12,7 @@
  */
 
 #include "tclInt.h"
-#include "tommath.h"
+#include "tclTomMath.h"
 
 #include <math.h>
 #include <assert.h>
diff --git a/generic/tclDictObj.c b/generic/tclDictObj.c
index 083af70..5c6cb52 100644
--- a/generic/tclDictObj.c
+++ b/generic/tclDictObj.c
@@ -11,7 +11,7 @@
  */
 
 #include "tclInt.h"
-#include "tommath.h"
+#include "tclTomMath.h"
 #include <assert.h>
 
 /*
diff --git a/generic/tclExecute.c b/generic/tclExecute.c
index 1bcedff..a2e9401 100644
--- a/generic/tclExecute.c
+++ b/generic/tclExecute.c
@@ -18,7 +18,7 @@
 #include "tclInt.h"
 #include "tclCompile.h"
 #include "tclOOInt.h"
-#include "tommath.h"
+#include "tclTomMath.h"
 #include <math.h>
 #include <assert.h>
 
diff --git a/generic/tclInt.h b/generic/tclInt.h
index 790eba1..af59ae1 100644
--- a/generic/tclInt.h
+++ b/generic/tclInt.h
@@ -5079,7 +5079,6 @@ typedef struct NRE_callback {
 
 #include "tclIntDecls.h"
 #include "tclIntPlatDecls.h"
-#include "tclTomMathDecls.h"
 
 #if !defined(USE_TCL_STUBS) && !defined(TCL_MEM_DEBUG)
 #define Tcl_AttemptAlloc(size)        TclpAlloc(size)
diff --git a/generic/tclObj.c b/generic/tclObj.c
index 954c648..e488edd 100644
--- a/generic/tclObj.c
+++ b/generic/tclObj.c
@@ -15,7 +15,7 @@
  */
 
 #include "tclInt.h"
-#include "tommath.h"
+#include "tclTomMath.h"
 #include <math.h>
 #include <assert.h>
 
diff --git a/generic/tclScan.c b/generic/tclScan.c
index f481cc9..8f2c892 100644
--- a/generic/tclScan.c
+++ b/generic/tclScan.c
@@ -10,7 +10,7 @@
  */
 
 #include "tclInt.h"
-#include "tommath.h"
+#include "tclTomMath.h"
 
 /*
  * Flag values used by Tcl_ScanObjCmd.
diff --git a/generic/tclStrToD.c b/generic/tclStrToD.c
index 866ee10..5477868 100644
--- a/generic/tclStrToD.c
+++ b/generic/tclStrToD.c
@@ -14,7 +14,7 @@
  */
 
 #include "tclInt.h"
-#include "tommath.h"
+#include "tclTomMath.h"
 #include <math.h>
 
 /*
diff --git a/generic/tclStringObj.c b/generic/tclStringObj.c
index 6b83c66..eed49b1 100644
--- a/generic/tclStringObj.c
+++ b/generic/tclStringObj.c
@@ -35,7 +35,7 @@
  */
 
 #include "tclInt.h"
-#include "tommath.h"
+#include "tclTomMath.h"
 #include "tclStringRep.h"
 
 #include "assert.h"
diff --git a/generic/tclTest.c b/generic/tclTest.c
index 73ce5d9..403b0a9 100644
--- a/generic/tclTest.c
+++ b/generic/tclTest.c
@@ -20,6 +20,7 @@
 #   define USE_TCL_STUBS
 #endif
 #include "tclInt.h"
+#include "tclTomMath.h"
 #include "tclOO.h"
 #include <math.h>
 
diff --git a/generic/tclTestObj.c b/generic/tclTestObj.c
index cc54f24..65a8887 100644
--- a/generic/tclTestObj.c
+++ b/generic/tclTestObj.c
@@ -18,7 +18,7 @@
 #   define USE_TCL_STUBS
 #endif
 #include "tclInt.h"
-#include "tommath.h"
+#include "tclTomMath.h"
 #include "tclStringRep.h"
 
 
diff --git a/generic/tclTomMathInterface.c b/generic/tclTomMathInterface.c
index 589599e..d4f7084 100644
--- a/generic/tclTomMathInterface.c
+++ b/generic/tclTomMathInterface.c
@@ -13,7 +13,7 @@
  */
 
 #include "tclInt.h"
-#include "tommath.h"
+#include "tclTomMath.h"
 
 MODULE_SCOPE const TclTomMathStubs tclTomMathStubs;
 
diff --git a/generic/tclTomMathStubLib.c b/generic/tclTomMathStubLib.c
index 715904c..7bebe12 100644
--- a/generic/tclTomMathStubLib.c
+++ b/generic/tclTomMathStubLib.c
@@ -12,6 +12,7 @@
  */
 
 #include "tclInt.h"
+#include "tclTomMath.h"
 
 MODULE_SCOPE const TclTomMathStubs *tclTomMathStubsPtr;
 
diff --git a/generic/tclUtil.c b/generic/tclUtil.c
index 9216380..659796e 100644
--- a/generic/tclUtil.c
+++ b/generic/tclUtil.c
@@ -15,7 +15,7 @@
 #include "tclInt.h"
 #include "tclParse.h"
 #include "tclStringTrim.h"
-#include "tommath.h"
+#include "tclTomMath.h"
 #include <math.h>
 
 /*
diff --git a/libtommath/win32/libtommath.dll b/libtommath/win32/libtommath.dll
new file mode 100755
index 0000000..4497517
--- /dev/null
+++ b/libtommath/win32/libtommath.dll
diff --git a/libtommath/win32/tommath.lib b/libtommath/win32/tommath.lib
new file mode 100644
index 0000000..bc866fb
--- /dev/null
+++ b/libtommath/win32/tommath.lib
diff --git a/libtommath/win64/libtommath.dll b/libtommath/win64/libtommath.dll
new file mode 100755
index 0000000..77d685b
--- /dev/null
+++ b/libtommath/win64/libtommath.dll
diff --git a/libtommath/win64/libtommath.dll.a b/libtommath/win64/libtommath.dll.a
new file mode 100644
index 0000000..54a76d7
--- /dev/null
+++ b/libtommath/win64/libtommath.dll.a
diff --git a/libtommath/win64/tommath.lib b/libtommath/win64/tommath.lib
new file mode 100755
index 0000000..9b0e7ad
--- /dev/null
+++ b/libtommath/win64/tommath.lib
diff --git a/unix/configure b/unix/configure
index d784b19..9fb8ddc 100755
--- a/unix/configure
+++ b/unix/configure
@@ -6894,9 +6894,6 @@ fi
 
     if test "${tcl_cv_type_64bit}" = none ; then
 
-$as_echo "#define MP_32BIT 1" >>confdefs.h
-
-
 $as_echo "#define TCL_WIDE_INT_IS_LONG 1" >>confdefs.h
 
 	{ $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
diff --git a/unix/tcl.m4 b/unix/tcl.m4
index f3e56e1..660faf4 100644
--- a/unix/tcl.m4
+++ b/unix/tcl.m4
@@ -2370,7 +2370,6 @@ AC_DEFUN([SC_TCL_EARLY_FLAGS],[
 #		HAVE_STRUCT_DIRENT64, HAVE_DIR64
 #		HAVE_STRUCT_STAT64
 #		HAVE_TYPE_OFF64_T
-#		MP_32BIT
 #
 #--------------------------------------------------------------------
 
@@ -2388,7 +2387,6 @@ AC_DEFUN([SC_TCL_64BIT_FLAGS], [
             case 1: case (sizeof(]${tcl_type_64bit}[)==sizeof(long)): ;
         }],tcl_cv_type_64bit=${tcl_type_64bit})])
     if test "${tcl_cv_type_64bit}" = none ; then
-	AC_DEFINE(MP_32BIT, 1, [Use 'MP_32BIT' for libtommath])
 	AC_DEFINE(TCL_WIDE_INT_IS_LONG, 1, [Do 'long' and 'long long' have the same size (64-bit)?])
 	AC_MSG_RESULT([yes])
     else
diff --git a/unix/tclConfig.h.in b/unix/tclConfig.h.in
index 290596f..042f798 100644
--- a/unix/tclConfig.h.in
+++ b/unix/tclConfig.h.in
@@ -310,9 +310,6 @@
 /* No Compiler support for module scope symbols */
 #undef MODULE_SCOPE
 
-/* Use 'MP_32BIT' for libtommath */
-#undef MP_32BIT
-
 /* Default libtommath precision. */
 #undef MP_PREC
 
diff --git a/win/configure b/win/configure
index ad107c8..4398996 100755
--- a/win/configure
+++ b/win/configure
@@ -4660,10 +4660,6 @@ $as_echo "#define HAVE_CAST_TO_UNION 1" >>confdefs.h
 	fi
     fi
 
-
-$as_echo "#define MP_32BIT 1" >>confdefs.h
-
-
     # DL_LIBS is empty, but then we match the Unix version
 
 
diff --git a/win/tcl.m4 b/win/tcl.m4
index e7d0e6d..d3d94ef 100644
--- a/win/tcl.m4
+++ b/win/tcl.m4
@@ -970,8 +970,6 @@ AC_DEFUN([SC_CONFIG_CFLAGS], [
 	fi
     fi
 
-    AC_DEFINE(MP_32BIT, 1, [Use 'MP_32BIT' for libtommath])
-
     # DL_LIBS is empty, but then we match the Unix version
     AC_SUBST(DL_LIBS)
     AC_SUBST(CFLAGS_DEBUG)
diff --git a/win/tclWinTest.c b/win/tclWinTest.c
index cd0e07f..ac39678 100644
--- a/win/tclWinTest.c
+++ b/win/tclWinTest.c
@@ -13,6 +13,7 @@
 #   define USE_TCL_STUBS
 #endif
 #include "tclInt.h"
+#include "tclTomMath.h"
 
 /*
  * For TestplatformChmod on Windows