From 0cdb762ff0a1aa77e68dd137315bcd46861505da Mon Sep 17 00:00:00 2001
From: "jan.nijtmans" <nijtmans@users.sourceforge.net>
Date: Tue, 2 Jul 2013 12:05:51 +0000
Subject: First experimental implementation of RFE [854941], built on top of
 [http://tip.tcl.tk/414|TIP #414].

---
 generic/tclStubLibDl.c | 91 ++++++++++++++++++++++++++++++++++++++++++++++++++
 unix/Makefile.in       |  6 +++-
 win/Makefile.in        |  4 +++
 win/makefile.bc        |  4 +++
 win/makefile.vc        |  4 +++
 win/tcl.dsp            |  4 +++
 6 files changed, 112 insertions(+), 1 deletion(-)
 create mode 100644 generic/tclStubLibDl.c

diff --git a/generic/tclStubLibDl.c b/generic/tclStubLibDl.c
new file mode 100644
index 0000000..1b12698
--- /dev/null
+++ b/generic/tclStubLibDl.c
@@ -0,0 +1,91 @@
+/*
+ * tclStubLibDl.c --
+ *
+ *	Stub object that will be statically linked into extensions that want
+ *	to access Tcl.
+ *
+ * Copyright (c) 1998-1999 by Scriptics Corporation.
+ * Copyright (c) 1998 Paul Duffin.
+ *
+ * See the file "license.terms" for information on usage and redistribution of
+ * this file, and for a DISCLAIMER OF ALL WARRANTIES.
+ */
+
+#include "tclInt.h"
+#ifndef _WIN32
+#   include <dlfcn.h>
+#else
+#   define dlopen(a,b) (void *)LoadLibraryA(a)
+#   define dlsym(a,b) (void *)GetProcAddress((HANDLE)(a),b)
+#endif
+
+/*
+ *----------------------------------------------------------------------
+ *
+ * Tcl_InitSubsystems --
+ *
+ *	Initialize the stub table, using the structure pointed at
+ *	by the "version" argument.
+ *
+ * Results:
+ *	Outputs the value of the "version" argument.
+ *
+ * Side effects:
+ *	Sets the stub table pointers.
+ *
+ *----------------------------------------------------------------------
+ */
+
+static TclStubInfoType info;
+
+MODULE_SCOPE const char *
+Tcl_InitSubsystems(
+	Tcl_PanicProc *panicProc)
+{
+    void *handle = dlopen(TCL_LIB_FILE, RTLD_NOW|RTLD_LOCAL);
+    const char *(*initSubsystems)(Tcl_PanicProc *);
+    const char *(*setPanicProc)(Tcl_PanicProc *);
+    Tcl_Interp *interp, *(*createInterp)(void);
+    int a,b,c,d;
+
+    if (!handle) {
+	if (panicProc) {
+	    panicProc("Cannot find Tcl core");
+	} else {
+	    fprintf(stderr, "Cannot find Tcl core");
+	    abort();
+	}
+	return NULL;
+    }
+    initSubsystems = dlsym(handle, "Tcl_InitSubsystems");
+    if (!initSubsystems) {
+	initSubsystems = dlsym(handle, "_Tcl_InitSubsystems");
+    }
+    if (initSubsystems) {
+	return initSubsystems(panicProc);
+    }
+    setPanicProc = dlsym(handle, "Tcl_SetPanicProc");
+    if (!setPanicProc) {
+	setPanicProc = dlsym(handle, "_Tcl_SetPanicProc");
+    }
+    createInterp = dlsym(handle, "Tcl_CreateInterp");
+    if (!createInterp) {
+	createInterp = dlsym(handle, "_Tcl_CreateInterp");
+    }
+
+    setPanicProc(panicProc);
+    interp = createInterp();
+    info.stubs = ((Interp *) interp)->stubTable;
+    info.stubs->tcl_DeleteInterp(interp);
+    info.stubs->tcl_GetVersion(&a, &b, &c, &d);
+    sprintf(info.version, "%d.%d.%d", a, b, c);
+    return info.version;
+}
+
+/*
+ * Local Variables:
+ * mode: c
+ * c-basic-offset: 4
+ * fill-column: 78
+ * End:
+ */
diff --git a/unix/Makefile.in b/unix/Makefile.in
index 5295a45..3f44748 100644
--- a/unix/Makefile.in
+++ b/unix/Makefile.in
@@ -335,7 +335,7 @@ TOMMATH_OBJS = bncore.o bn_reverse.o bn_fast_s_mp_mul_digs.o \
 	bn_mp_unsigned_bin_size.o bn_mp_xor.o bn_mp_zero.o bn_s_mp_add.o \
         bn_s_mp_mul_digs.o bn_s_mp_sqr.o bn_s_mp_sub.o
 
-STUB_LIB_OBJS = tclStubLib.o tclStubLibTbl.o tclTomMathStubLib.o tclOOStubLib.o ${COMPAT_OBJS}
+STUB_LIB_OBJS = tclStubLib.o tclStubLibTbl.o tclStubLibDl.o tclTomMathStubLib.o tclOOStubLib.o ${COMPAT_OBJS}
 
 UNIX_OBJS = tclUnixChan.o tclUnixEvent.o tclUnixFCmd.o \
 	tclUnixFile.o tclUnixPipe.o tclUnixSock.o \
@@ -471,6 +471,7 @@ OO_SRCS = \
 STUB_SRCS = \
 	$(GENERIC_DIR)/tclStubLib.c \
 	$(GENERIC_DIR)/tclStubLibTbl.c \
+	$(GENERIC_DIR)/tclStubLibDl.c \
 	$(GENERIC_DIR)/tclTomMathStubLib.c \
 	$(GENERIC_DIR)/tclOOStubLib.c
 
@@ -1689,6 +1690,9 @@ tclStubLib.o: $(GENERIC_DIR)/tclStubLib.c
 tclStubLibTbl.o: $(GENERIC_DIR)/tclStubLibTbl.c
 	$(CC) -c $(STUB_CC_SWITCHES) $(GENERIC_DIR)/tclStubLibTbl.c
 
+tclStubLibDl.o: $(GENERIC_DIR)/tclStubLibDl.c
+	$(CC) -c $(STUB_CC_SWITCHES) -DTCL_LIB_FILE="\"$(TCL_LIB_FILE)\"" $(GENERIC_DIR)/tclStubLibDl.c
+
 tclTomMathStubLib.o: $(GENERIC_DIR)/tclTomMathStubLib.c
 	$(CC) -c $(STUB_CC_SWITCHES) $(GENERIC_DIR)/tclTomMathStubLib.c
 
diff --git a/win/Makefile.in b/win/Makefile.in
index d7b25b7..986b517 100644
--- a/win/Makefile.in
+++ b/win/Makefile.in
@@ -386,6 +386,7 @@ REG_OBJS = tclWinReg.$(OBJEXT)
 STUB_OBJS = \
 	tclStubLib.$(OBJEXT) \
 	tclStubLibTbl.$(OBJEXT) \
+	tclStubLibDl.$(OBJEXT) \
 	tclTomMathStubLib.$(OBJEXT) \
 	tclOOStubLib.$(OBJEXT)
 
@@ -519,6 +520,9 @@ tclStubLib.${OBJEXT}: tclStubLib.c
 tclStubLibTbl.${OBJEXT}: tclStubLibTbl.c
 	$(CC) -c $(CC_SWITCHES) -DSTATIC_BUILD @DEPARG@ $(CC_OBJNAME)
 
+tclStubLibDl.${OBJEXT}: tclStubLibDl.c
+	$(CC) -c $(CC_SWITCHES) -DSTATIC_BUILD -DTCL_LIB_FILE="\"$(TCL_LIB_FILE)\"" @DEPARG@ $(CC_OBJNAME)
+
 tclTomMathStubLib.${OBJEXT}: tclTomMathStubLib.c
 	$(CC) -c $(CC_SWITCHES) -DSTATIC_BUILD @DEPARG@ $(CC_OBJNAME)
 
diff --git a/win/makefile.bc b/win/makefile.bc
index 2726dad..0315c98 100644
--- a/win/makefile.bc
+++ b/win/makefile.bc
@@ -280,6 +280,7 @@ TCLOBJS	= \
 TCLSTUBOBJS	= \
 	$(TMPDIR)\tclStubLib.obj \
 	$(TMPDIR)\tclStubLibTbl.obj \
+	$(TMPDIR)\tclStubLibDl.obj \
 	$(TMPDIR)\tclTomMathStubLib.obj \
 	$(TMPDIR)\tclOOStubLib.obj
 
@@ -532,6 +533,9 @@ $(TMPDIR)\tclStubLib.obj : $(GENERICDIR)\tclStubLib.c
 $(TMPDIR)\tclStubLibTbl.obj : $(GENERICDIR)\tclStubLibTbl.c
 	$(cc32) $(TCL_CFLAGS) -DSTATIC_BUILD -o$(TMPDIR)\$@ $?
 
+$(TMPDIR)\tclStubLibDl.obj : $(GENERICDIR)\tclStubLibDl.c
+	$(cc32) $(TCL_CFLAGS) -DSTATIC_BUILD -o$(TMPDIR)\$@ $?
+
 $(TMPDIR)\tclTomMathStubLib.obj : $(GENERICDIR)\tclTomMathStubLib.c
 	$(cc32) $(TCL_CFLAGS) -DSTATIC_BUILD -o$(TMPDIR)\$@ $?
 
diff --git a/win/makefile.vc b/win/makefile.vc
index c24534a..cf61bbf 100644
--- a/win/makefile.vc
+++ b/win/makefile.vc
@@ -451,6 +451,7 @@ TCLOBJS = $(COREOBJS) $(ZLIBOBJS) $(TOMMATHOBJS) $(PLATFORMOBJS)
 TCLSTUBOBJS = \
 	$(TMP_DIR)\tclStubLib.obj \
 	$(TMP_DIR)\tclStubLibTbl.obj \
+	$(TMP_DIR)\tclStubLibDl.obj \
 	$(TMP_DIR)\tclTomMathStubLib.obj \
 	$(TMP_DIR)\tclOOStubLib.obj
 
@@ -983,6 +984,9 @@ $(TMP_DIR)\tclStubLib.obj: $(GENERICDIR)\tclStubLib.c
 $(TMP_DIR)\tclStubLibTbl.obj: $(GENERICDIR)\tclStubLibTbl.c
 	$(cc32) $(STUB_CFLAGS) -Zl -DSTATIC_BUILD $(TCL_INCLUDES) -Fo$@ $?
 
+$(TMP_DIR)\tclStubLibDl.obj: $(GENERICDIR)\tclStubLibDl.c
+	$(cc32) $(STUB_CFLAGS) -Zl -DSTATIC_BUILD $(TCL_INCLUDES) -Fo$@ $?
+
 $(TMP_DIR)\tclTomMathStubLib.obj: $(GENERICDIR)\tclTomMathStubLib.c
 	$(cc32) $(STUB_CFLAGS) -Zl -DSTATIC_BUILD $(TCL_INCLUDES) -Fo$@ $?
 
diff --git a/win/tcl.dsp b/win/tcl.dsp
index 2708051..afe1960 100644
--- a/win/tcl.dsp
+++ b/win/tcl.dsp
@@ -1304,6 +1304,10 @@ SOURCE=..\generic\tclStubLibTbl.c
 # End Source File
 # Begin Source File
 
+SOURCE=..\generic\tclStubLibDl.c
+# End Source File
+# Begin Source File
+
 SOURCE=..\generic\tclOOStubLib.c
 # End Source File
 # Begin Source File
-- 
cgit v0.12


From f44c65ff893ab9fe381cbd0556fe81c35d09c6fa Mon Sep 17 00:00:00 2001
From: "jan.nijtmans" <nijtmans@users.sourceforge.net>
Date: Thu, 24 Sep 2015 14:43:22 +0000
Subject: Minor simplification and correct TCL_NORETURN decoration

---
 generic/tclStubLibDl.c | 15 ++++-----------
 1 file changed, 4 insertions(+), 11 deletions(-)

diff --git a/generic/tclStubLibDl.c b/generic/tclStubLibDl.c
index bae2e64..2e09659 100644
--- a/generic/tclStubLibDl.c
+++ b/generic/tclStubLibDl.c
@@ -46,7 +46,7 @@ Tcl_InitSubsystems(
     const char *(*initSubsystems)(TCL_NORETURN1 Tcl_PanicProc *);
     int a,b,c,d;
 
-    if (!info.version[0]) {
+    if (!info.stubs) {
 	void *handle = dlopen(TCL_DLL_FILE, RTLD_NOW|RTLD_LOCAL);
 	if (!handle) {
 	    handle = dlopen(TCL_PREV_DLL_FILE, RTLD_NOW|RTLD_LOCAL);
@@ -67,12 +67,11 @@ Tcl_InitSubsystems(
 	if (initSubsystems) {
 	    /* If the core has TIP #414, use it. */
 	    const char *version = initSubsystems(panicProc);
+	    strcpy(info.version, version);
 	    info.stubs = ((const TclStubs **)version)[-1];
-	    strcpy(info.version+1, version+1);
-	    info.version[0] = version[0];
 	} else {
 	    const TclStubs *stubs;
-	    const char *(*setPanicProc)(Tcl_PanicProc *);
+	    const char *(*setPanicProc)(TCL_NORETURN1 Tcl_PanicProc *);
 	    Tcl_Interp *interp, *(*createInterp)(void);
 
 	    setPanicProc = dlsym(handle, "Tcl_SetPanicProc");
@@ -88,14 +87,8 @@ Tcl_InitSubsystems(
 	    stubs = ((Interp *) interp)->stubTable;
 	    stubs->tcl_DeleteInterp(interp);
 	    stubs->tcl_GetVersion(&a, &b, &c, &d);
+	    sprintf(info.version, "%d.%d%c%d", a, b, "ab."[d], c);
 	    info.stubs = stubs;
-	    if (a>9) {
-		sprintf(info.version+1, "%d.%d%c%d", a%10, b, "ab."[d], c);
-		info.version[0] = '0' + (a/10);
-	    } else {
-		sprintf(info.version+1, ".%d%c%d", b, "ab."[d], c);
-		info.version[0] = '0' + a;
-	    }
 	}
     }
     return info.version;
-- 
cgit v0.12


From 810b6c7f3298a148dbfdd9e789e39cc338ea4525 Mon Sep 17 00:00:00 2001
From: "jan.nijtmans" <nijtmans@users.sourceforge.net>
Date: Mon, 19 Aug 2019 15:01:09 +0000
Subject: Further implementation of 2 new functions.

---
 generic/tcl.decls               |  4 +--
 generic/tcl.h                   | 21 ++++++++----
 generic/tclDecls.h              | 10 ------
 generic/tclStubFindExecutable.c | 71 ++++++++++++++++++++++++++++++++++++++
 generic/tclStubInitSubsystems.c | 70 +++++++++++++++++++++++++++++++++++++
 generic/tclStubLibDl.c          | 73 ---------------------------------------
 generic/tclStubSetPanicProc.c   | 76 +++++++++++++++++++++++++++++++++++++++++
 unix/Makefile.in                | 18 +++++++---
 unix/tclAppInit.c               |  4 +--
 win/Makefile.in                 | 16 ++++++---
 win/makefile.vc                 | 12 +++++--
 win/tcl.dsp                     | 26 +++++++++-----
 win/tclAppInit.c                |  2 +-
 13 files changed, 289 insertions(+), 114 deletions(-)
 create mode 100644 generic/tclStubFindExecutable.c
 create mode 100644 generic/tclStubInitSubsystems.c
 delete mode 100644 generic/tclStubLibDl.c
 create mode 100644 generic/tclStubSetPanicProc.c

diff --git a/generic/tcl.decls b/generic/tcl.decls
index 815183e..ec697f2 100644
--- a/generic/tcl.decls
+++ b/generic/tcl.decls
@@ -532,7 +532,7 @@ declare 143 {
 }
 # Removed in 9.0 (stub entry only)
 #declare 144 {
-#    void Tcl_FindExecutable(const char *argv0)
+#    const char *Tcl_FindExecutable(const char *argv0)
 #}
 declare 145 {
     Tcl_HashEntry *Tcl_FirstHashEntry(Tcl_HashTable *tablePtr,
@@ -2502,7 +2502,7 @@ export {
     Tcl_ExitProc *Tcl_SetExitProc(TCL_NORETURN1 Tcl_ExitProc *proc)
 }
 export {
-    void Tcl_FindExecutable(const char *argv0)
+    const char *Tcl_FindExecutable(const char *argv0)
 }
 export {
     const char *Tcl_InitStubs(Tcl_Interp *interp, const char *version,
diff --git a/generic/tcl.h b/generic/tcl.h
index 6a9e818..0ace839 100644
--- a/generic/tcl.h
+++ b/generic/tcl.h
@@ -2225,21 +2225,16 @@ const char *		TclInitStubTable(const char *version);
  */
 
 #define Tcl_Main(argc, argv, proc) Tcl_MainEx(argc, argv, proc, \
-	    ((Tcl_SetPanicProc(Tcl_ConsolePanic), Tcl_CreateInterp)()))
+	    ((Tcl_SetPanicProc(Tcl_ConsolePanic), Tcl_CreateInterp())))
 EXTERN TCL_NORETURN void Tcl_MainEx(int argc, char **argv,
 			    Tcl_AppInitProc *appInitProc, Tcl_Interp *interp);
 EXTERN const char *	Tcl_PkgInitStubsCheck(Tcl_Interp *interp,
 			    const char *version, int exact);
 EXTERN void		Tcl_GetMemoryInfo(Tcl_DString *dsPtr);
 EXTERN const char *	Tcl_FindExecutable(const char *argv0);
+EXTERN const char *	Tcl_InitSubsystems(void);
 EXTERN const char *	Tcl_SetPanicProc(
 			    TCL_NORETURN1 Tcl_PanicProc *panicProc);
-#ifdef USE_TCL_STUBS
-#define Tcl_SetPanicProc(panicProc) \
-    TclInitStubTable((Tcl_SetPanicProc)(panicProc))
-#define Tcl_FindExecutable(argv0) \
-    TclInitStubTable((Tcl_FindExecutable)((const char *)argv0))
-#endif
 EXTERN void		Tcl_StaticPackage(Tcl_Interp *interp,
 			    const char *pkgName,
 			    Tcl_PackageInitProc *initProc,
@@ -2248,6 +2243,18 @@ EXTERN Tcl_ExitProc *Tcl_SetExitProc(TCL_NORETURN1 Tcl_ExitProc *proc);
 #ifndef _WIN32
 EXTERN int		TclZipfs_AppHook(int *argc, char ***argv);
 #endif
+extern const char *TclStubFindExecutable(const char *argv0);
+extern const char *TclStubInitSubsystems(void);
+extern const char *TclStubSetPanicProc(
+	    TCL_NORETURN1 Tcl_PanicProc *panicProc);
+#ifdef USE_TCL_STUBS
+#define Tcl_FindExecutable(argv0) \
+    TclInitStubTable((TclStubFindExecutable)((const char *)argv0))
+#define Tcl_InitSubsystems() \
+    TclInitStubTable((TclStubInitSubsystems)())
+#define Tcl_SetPanicProc(panicProc) \
+    TclInitStubTable((TclStubSetPanicProc)(panicProc))
+#endif
 
 /*
  *----------------------------------------------------------------------------
diff --git a/generic/tclDecls.h b/generic/tclDecls.h
index 71aa8b8..e28d724 100644
--- a/generic/tclDecls.h
+++ b/generic/tclDecls.h
@@ -3711,16 +3711,6 @@ extern const TclStubs *tclStubsPtr;
 
 /* !END!: Do not edit above this line. */
 
-#if defined(USE_TCL_STUBS)
-#   undef Tcl_CreateInterp
-#   undef Tcl_Init
-#   undef Tcl_ObjSetVar2
-#   define Tcl_CreateInterp() (tclStubsPtr->tcl_CreateInterp())
-#   define Tcl_Init(interp) (tclStubsPtr->tcl_Init(interp))
-#   define Tcl_ObjSetVar2(interp, part1, part2, newValue, flags) \
-	    (tclStubsPtr->tcl_ObjSetVar2(interp, part1, part2, newValue, flags))
-#endif
-
 #if defined(_WIN32) && defined(UNICODE)
 #ifndef USE_TCL_STUBS
 #   define Tcl_FindExecutable(arg) ((Tcl_FindExecutable)((const char *)(arg)))
diff --git a/generic/tclStubFindExecutable.c b/generic/tclStubFindExecutable.c
new file mode 100644
index 0000000..17ee576
--- /dev/null
+++ b/generic/tclStubFindExecutable.c
@@ -0,0 +1,71 @@
+/*
+ * tclStubLibDl.c --
+ *
+ *	Stub object that will be statically linked into extensions that want
+ *	to access Tcl.
+ *
+ * Copyright (c) 1998-1999 by Scriptics Corporation.
+ * Copyright (c) 1998 Paul Duffin.
+ *
+ * See the file "license.terms" for information on usage and redistribution of
+ * this file, and for a DISCLAIMER OF ALL WARRANTIES.
+ */
+
+#include "tclInt.h"
+#ifndef _WIN32
+#   include <dlfcn.h>
+#else
+#   define dlopen(a,b) (void *)LoadLibrary(TEXT(a))
+#   define dlsym(a,b) (void *)GetProcAddress((HANDLE)(a),b)
+#   define dlerror() ""
+#endif
+
+/*
+ *----------------------------------------------------------------------
+ *
+ * Tcl_FindExecutable --
+ *
+ *	Load the Tcl core dynamically, version "9.0" (or higher, in future versions)
+ *
+ * Results:
+ *	Outputs the value of the "version" argument.
+ *
+ * Side effects:
+ *	Sets the stub table pointers.
+ *
+ *----------------------------------------------------------------------
+ */
+
+static const char PROCNAME[] = "_Tcl_FindExecutable";
+
+MODULE_SCOPE const char *
+TclStubFindExecutable(
+    const char *argv0)
+{
+    static const char *(*findExecutable)(const char *argv0) = NULL;
+    static const char *version = NULL;
+
+    if (!findExecutable) {
+	void *handle = dlopen(TCL_DLL_FILE, RTLD_NOW|RTLD_LOCAL);
+	if (!handle) {
+	    fprintf(stderr, "Cannot find " TCL_DLL_FILE ": %s\n", dlerror());
+	    abort();
+	}
+	findExecutable = dlsym(handle, PROCNAME + 1);
+	if (!findExecutable) {
+		findExecutable = dlsym(handle, PROCNAME);
+	}
+	if (findExecutable) {
+	    version = findExecutable(argv0);
+	}
+    }
+    return version;
+}
+
+/*
+ * Local Variables:
+ * mode: c
+ * c-basic-offset: 4
+ * fill-column: 78
+ * End:
+ */
diff --git a/generic/tclStubInitSubsystems.c b/generic/tclStubInitSubsystems.c
new file mode 100644
index 0000000..e683adf
--- /dev/null
+++ b/generic/tclStubInitSubsystems.c
@@ -0,0 +1,70 @@
+/*
+ * tclStubLibDl.c --
+ *
+ *	Stub object that will be statically linked into extensions that want
+ *	to access Tcl.
+ *
+ * Copyright (c) 1998-1999 by Scriptics Corporation.
+ * Copyright (c) 1998 Paul Duffin.
+ *
+ * See the file "license.terms" for information on usage and redistribution of
+ * this file, and for a DISCLAIMER OF ALL WARRANTIES.
+ */
+
+#include "tclInt.h"
+#ifndef _WIN32
+#   include <dlfcn.h>
+#else
+#   define dlopen(a,b) (void *)LoadLibrary(TEXT(a))
+#   define dlsym(a,b) (void *)GetProcAddress((HANDLE)(a),b)
+#   define dlerror() ""
+#endif
+
+/*
+ *----------------------------------------------------------------------
+ *
+ * Tcl_InitSubsystems --
+ *
+ *	Load the Tcl core dynamically, version "9.0" (or higher, in future versions)
+ *
+ * Results:
+ *	Outputs the value of the "version" argument.
+ *
+ * Side effects:
+ *	Sets the stub table pointers.
+ *
+ *----------------------------------------------------------------------
+ */
+
+static const char PROCNAME[] = "_Tcl_InitSubsystems";
+
+MODULE_SCOPE const char *
+TclStubInitSubsystems(void)
+{
+    static const char *(*initSubsystems)(void) = NULL;
+    static const char *version = NULL;
+
+    if (!initSubsystems) {
+	void *handle = dlopen(TCL_DLL_FILE, RTLD_NOW|RTLD_LOCAL);
+	if (!handle) {
+	    fprintf(stderr, "Cannot find " TCL_DLL_FILE ": %s\n", dlerror());
+	    abort();
+	}
+	initSubsystems = dlsym(handle, PROCNAME + 1);
+	if (!initSubsystems) {
+		initSubsystems = dlsym(handle, PROCNAME);
+	}
+	if (initSubsystems) {
+	    version = initSubsystems();
+	}
+    }
+    return version;
+}
+
+/*
+ * Local Variables:
+ * mode: c
+ * c-basic-offset: 4
+ * fill-column: 78
+ * End:
+ */
diff --git a/generic/tclStubLibDl.c b/generic/tclStubLibDl.c
deleted file mode 100644
index 67d9e7d..0000000
--- a/generic/tclStubLibDl.c
+++ /dev/null
@@ -1,73 +0,0 @@
-/*
- * tclStubLibDl.c --
- *
- *	Stub object that will be statically linked into extensions that want
- *	to access Tcl.
- *
- * Copyright (c) 1998-1999 by Scriptics Corporation.
- * Copyright (c) 1998 Paul Duffin.
- *
- * See the file "license.terms" for information on usage and redistribution of
- * this file, and for a DISCLAIMER OF ALL WARRANTIES.
- */
-
-#include "tclInt.h"
-#ifndef _WIN32
-#   include <dlfcn.h>
-#else
-#   define dlopen(a,b) (void *)LoadLibrary(TEXT(a))
-#   define dlsym(a,b) (void *)GetProcAddress((HANDLE)(a),b)
-#endif
-
-/*
- *----------------------------------------------------------------------
- *
- * Tcl_SetPanicProc --
- *
- *	Load the Tcl core dynamically, version "9.0" (or higher, in future versions)
- *
- * Results:
- *	Outputs the value of the "version" argument.
- *
- * Side effects:
- *	Sets the stub table pointers.
- *
- *----------------------------------------------------------------------
- */
-
-MODULE_SCOPE const char *
-Tcl_SetPanicProc(
-	TCL_NORETURN1 Tcl_PanicProc *panicProc)
-{
-    static const char *(*setPanicProc)(TCL_NORETURN1 Tcl_PanicProc *) = NULL;
-    static const char *version = NULL;
-
-    if (!setPanicProc) {
-	void *handle = dlopen(TCL_DLL_FILE, RTLD_NOW|RTLD_LOCAL);
-	if (!handle) {
-	    if (panicProc) {
-		panicProc("Cannot find " TCL_DLL_FILE);
-	    } else {
-		fprintf(stderr, "Cannot find " TCL_DLL_FILE);
-		abort();
-	    }
-	    return NULL;
-	}
-	setPanicProc = dlsym(handle, "Tcl_SetPanicProc");
-	if (!setPanicProc) {
-		setPanicProc = dlsym(handle, "_Tcl_SetPanicProc");
-	}
-	if (setPanicProc) {
-	    version = setPanicProc(panicProc);
-	}
-    }
-    return version;
-}
-
-/*
- * Local Variables:
- * mode: c
- * c-basic-offset: 4
- * fill-column: 78
- * End:
- */
diff --git a/generic/tclStubSetPanicProc.c b/generic/tclStubSetPanicProc.c
new file mode 100644
index 0000000..8742370
--- /dev/null
+++ b/generic/tclStubSetPanicProc.c
@@ -0,0 +1,76 @@
+/*
+ * tclStubLibDl.c --
+ *
+ *	Stub object that will be statically linked into extensions that want
+ *	to access Tcl.
+ *
+ * Copyright (c) 1998-1999 by Scriptics Corporation.
+ * Copyright (c) 1998 Paul Duffin.
+ *
+ * See the file "license.terms" for information on usage and redistribution of
+ * this file, and for a DISCLAIMER OF ALL WARRANTIES.
+ */
+
+#include "tclInt.h"
+#ifndef _WIN32
+#   include <dlfcn.h>
+#else
+#   define dlopen(a,b) (void *)LoadLibrary(TEXT(a))
+#   define dlsym(a,b) (void *)GetProcAddress((HANDLE)(a),b)
+#   define dlerror() ""
+#endif
+
+/*
+ *----------------------------------------------------------------------
+ *
+ * Tcl_SetPanicProc --
+ *
+ *	Load the Tcl core dynamically, version "9.0" (or higher, in future versions)
+ *
+ * Results:
+ *	Outputs the value of the "version" argument.
+ *
+ * Side effects:
+ *	Sets the stub table pointers.
+ *
+ *----------------------------------------------------------------------
+ */
+
+static const char PROCNAME[] = "_Tcl_SetPanicProc";
+
+MODULE_SCOPE const char *
+TclStubSetPanicProc(
+	TCL_NORETURN1 Tcl_PanicProc *panicProc)
+{
+    static const char *(*setPanicProc)(TCL_NORETURN1 Tcl_PanicProc *) = NULL;
+    static const char *version = NULL;
+
+    if (!setPanicProc) {
+	void *handle = dlopen(TCL_DLL_FILE, RTLD_NOW|RTLD_LOCAL);
+	if (!handle) {
+	    if (panicProc) {
+		panicProc("Cannot find " TCL_DLL_FILE ": %s\n", dlerror());
+	    } else {
+	    fprintf(stderr, "Cannot find " TCL_DLL_FILE ": %s\n", dlerror());
+		abort();
+	    }
+	    return NULL;
+	}
+	setPanicProc = dlsym(handle, PROCNAME + 1);
+	if (!setPanicProc) {
+		setPanicProc = dlsym(handle, PROCNAME);
+	}
+	if (setPanicProc) {
+	    version = setPanicProc(panicProc);
+	}
+    }
+    return version;
+}
+
+/*
+ * Local Variables:
+ * mode: c
+ * c-basic-offset: 4
+ * fill-column: 78
+ * End:
+ */
diff --git a/unix/Makefile.in b/unix/Makefile.in
index 3b24caf..5767db1 100644
--- a/unix/Makefile.in
+++ b/unix/Makefile.in
@@ -345,7 +345,9 @@ TOMMATH_OBJS = bn_reverse.o bn_fast_s_mp_mul_digs.o \
 	bn_s_mp_mul_digs.o bn_s_mp_sqr.o bn_s_mp_sub.o
 
 STUB_LIB_OBJS = tclStubLib.o \
-	tclStubLibDl.o \
+	tclStubFindExecutable.o \
+	tclStubInitSubsystems.o \
+	tclStubSetPanicProc.o \
 	tclStubLibTbl.o \
 	tclTomMathStubLib.o \
 	tclOOStubLib.o \
@@ -489,7 +491,9 @@ OO_SRCS = \
 
 STUB_SRCS = \
 	$(GENERIC_DIR)/tclStubLib.c \
-	$(GENERIC_DIR)/tclStubLibDl.c \
+	$(GENERIC_DIR)/tclStubFindExecutable.c \
+	$(GENERIC_DIR)/tclStubInitSubsystems.c \
+	$(GENERIC_DIR)/tclStubSetPanicProc.c \
 	$(GENERIC_DIR)/tclStubLibTbl.c \
 	$(GENERIC_DIR)/tclTomMathStubLib.c \
 	$(GENERIC_DIR)/tclOOStubLib.c
@@ -1825,8 +1829,14 @@ Zzutil.o:    $(ZLIB_DIR)/zutil.c
 tclStubLib.o: $(GENERIC_DIR)/tclStubLib.c
 	$(CC) -c $(STUB_CC_SWITCHES) -DSTATIC_BUILD $(GENERIC_DIR)/tclStubLib.c
 
-tclStubLibDl.o: $(GENERIC_DIR)/tclStubLibDl.c
-	$(CC) -c $(STUB_CC_SWITCHES) -DSTATIC_BUILD -DTCL_DLL_FILE="\"$(TCL_LIB_FILE)\"" $(GENERIC_DIR)/tclStubLibDl.c
+tclStubFindExecutable.o: $(GENERIC_DIR)/tclStubFindExecutable.c
+	$(CC) -c $(STUB_CC_SWITCHES) -DSTATIC_BUILD -DTCL_DLL_FILE="\"$(TCL_LIB_FILE)\"" $(GENERIC_DIR)/tclStubFindExecutable.c
+
+tclStubInitSubsystems.o: $(GENERIC_DIR)/tclStubInitSubsystems.c
+	$(CC) -c $(STUB_CC_SWITCHES) -DSTATIC_BUILD -DTCL_DLL_FILE="\"$(TCL_LIB_FILE)\"" $(GENERIC_DIR)/tclStubInitSubsystems.c
+
+tclStubSetPanicProc.o: $(GENERIC_DIR)/tclStubSetPanicProc.c
+	$(CC) -c $(STUB_CC_SWITCHES) -DSTATIC_BUILD -DTCL_DLL_FILE="\"$(TCL_LIB_FILE)\"" $(GENERIC_DIR)/tclStubSetPanicProc.c
 
 tclStubLibTbl.o: $(GENERIC_DIR)/tclStubLibTbl.c
 	$(CC) -c $(STUB_CC_SWITCHES) -DSTATIC_BUILD $(GENERIC_DIR)/tclStubLibTbl.c
diff --git a/unix/tclAppInit.c b/unix/tclAppInit.c
index 3587f35..b791440 100644
--- a/unix/tclAppInit.c
+++ b/unix/tclAppInit.c
@@ -152,10 +152,10 @@ Tcl_AppInit(
      */
 
 #ifdef DJGPP
-    (Tcl_ObjSetVar2)(interp, Tcl_NewStringObj("tcl_rcFileName", -1), NULL,
+    Tcl_ObjSetVar2(interp, Tcl_NewStringObj("tcl_rcFileName", -1), NULL,
 	    Tcl_NewStringObj("~/tclsh.rc", -1), TCL_GLOBAL_ONLY);
 #else
-    (Tcl_ObjSetVar2)(interp, Tcl_NewStringObj("tcl_rcFileName", -1), NULL,
+    Tcl_ObjSetVar2(interp, Tcl_NewStringObj("tcl_rcFileName", -1), NULL,
 	    Tcl_NewStringObj("~/.tclshrc", -1), TCL_GLOBAL_ONLY);
 #endif
 
diff --git a/win/Makefile.in b/win/Makefile.in
index 8bc34d5..13100af 100644
--- a/win/Makefile.in
+++ b/win/Makefile.in
@@ -455,7 +455,9 @@ REG_OBJS = tclWinReg.$(OBJEXT)
 
 STUB_OBJS = \
 	tclStubLib.$(OBJEXT) \
-	tclStubLibDl.$(OBJEXT) \
+	tclStubFindExecutable.$(OBJEXT) \
+	tclStubInitSubsystems.$(OBJEXT) \
+	tclStubSetPanicProc.$(OBJEXT) \
 	tclStubLibTbl.$(OBJEXT) \
 	tclTomMathStubLib.$(OBJEXT) \
 	tclOOStubLib.$(OBJEXT) \
@@ -622,8 +624,8 @@ tclWinInit.${OBJEXT}: tclWinInit.c
 tclWinPipe.${OBJEXT}: tclWinPipe.c
 	$(CC) -c $(CC_SWITCHES) -DBUILD_tcl $(EXTFLAGS) @DEPARG@ $(CC_OBJNAME)
 
-testMain.${OBJEXT}: tclAppInit.c
-	$(CC) -c $(CC_SWITCHES) -DTCL_TEST @DEPARG@ $(CC_OBJNAME)
+tclAppInit.${OBJEXT}: tclAppInit.c
+	$(CC) -c $(CC_SWITCHES) -DBUILD_tcl @DEPARG@ $(CC_OBJNAME)
 
 tclMain2.${OBJEXT}: tclMain.c
 	$(CC) -c $(CC_SWITCHES) -DBUILD_tcl -DTCL_ASCII_MAIN @DEPARG@ $(CC_OBJNAME)
@@ -671,7 +673,13 @@ tclPkgConfig.${OBJEXT}: tclPkgConfig.c
 tclStubLib.${OBJEXT}: tclStubLib.c
 	$(CC) -c $(CC_SWITCHES) -DSTATIC_BUILD @DEPARG@ $(CC_OBJNAME)
 
-tclStubLibDl.${OBJEXT}: tclStubLibDl.c
+tclStubFindExecutable.${OBJEXT}: tclStubFindExecutable.c
+	$(CC) -c $(CC_SWITCHES) -DSTATIC_BUILD -DTCL_DLL_FILE="\"$(TCL_DLL_FILE)\"" @DEPARG@ $(CC_OBJNAME)
+
+tclStubInitSubsystems.${OBJEXT}: tclStubInitSubsystems.c
+	$(CC) -c $(CC_SWITCHES) -DSTATIC_BUILD -DTCL_DLL_FILE="\"$(TCL_DLL_FILE)\"" @DEPARG@ $(CC_OBJNAME)
+
+tclStubSetPanicProc.${OBJEXT}: tclStubSetPanicProc.c
 	$(CC) -c $(CC_SWITCHES) -DSTATIC_BUILD -DTCL_DLL_FILE="\"$(TCL_DLL_FILE)\"" @DEPARG@ $(CC_OBJNAME)
 
 tclStubLibTbl.${OBJEXT}: tclStubLibTbl.c
diff --git a/win/makefile.vc b/win/makefile.vc
index aafd9fb..ea15b0d 100644
--- a/win/makefile.vc
+++ b/win/makefile.vc
@@ -413,7 +413,9 @@ TCLOBJS = $(COREOBJS) $(ZLIBOBJS) $(TOMMATHOBJS) $(PLATFORMOBJS)
 
 TCLSTUBOBJS = \
 	$(TMP_DIR)\tclStubLib.obj \
-	$(TMP_DIR)\tclStubLibDl.obj \
+	$(TMP_DIR)\tclStubFindExecutable.obj \
+	$(TMP_DIR)\tclStubInitSubsystems.obj \
+	$(TMP_DIR)\tclStubSetPanicProc.obj \
 	$(TMP_DIR)\tclStubLibTbl.obj \
 	$(TMP_DIR)\tclTomMathStubLib.obj \
 	$(TMP_DIR)\tclOOStubLib.obj \
@@ -802,7 +804,13 @@ $(TMP_DIR)\tclWinDde.obj: $(WINDIR)\tclWinDde.c
 $(TMP_DIR)\tclStubLib.obj: $(GENERICDIR)\tclStubLib.c
 	$(cc32) $(stubscflags) -Fo$@ $?
 
-$(TMP_DIR)\tclStubLibDl.obj: $(GENERICDIR)\tclStubLibDl.c
+$(TMP_DIR)\tclStubFindExecutable.obj: $(GENERICDIR)\tclStubFindExecutable.c
+	$(cc32) $(STUB_CFLAGS) -Zl -DSTATIC_BUILD -DTCL_DLL_FILE="\"tcl86.dll\"" $(TCL_INCLUDES) -Fo$@ $?
+
+$(TMP_DIR)\tclStubInitSubsystems.obj: $(GENERICDIR)\tclStubInitSubsystems.c
+	$(cc32) $(STUB_CFLAGS) -Zl -DSTATIC_BUILD -DTCL_DLL_FILE="\"tcl86.dll\"" $(TCL_INCLUDES) -Fo$@ $?
+
+$(TMP_DIR)\tclStubSetPanicProc.obj: $(GENERICDIR)\tclStubSetPanicProc.c
 	$(cc32) $(STUB_CFLAGS) -Zl -DSTATIC_BUILD -DTCL_DLL_FILE="\"tcl86.dll\"" $(TCL_INCLUDES) -Fo$@ $?
 
 $(TMP_DIR)\tclStubLibTbl.obj: $(GENERICDIR)\tclStubLibTbl.c
diff --git a/win/tcl.dsp b/win/tcl.dsp
index a8e71d2..68a1612 100644
--- a/win/tcl.dsp
+++ b/win/tcl.dsp
@@ -7,21 +7,21 @@
 CFG=tcl - Win32 Debug Static
 !MESSAGE This is not a valid makefile. To build this project using NMAKE,
 !MESSAGE use the Export Makefile command and run
-!MESSAGE 
+!MESSAGE
 !MESSAGE NMAKE /f "tcl.mak".
-!MESSAGE 
+!MESSAGE
 !MESSAGE You can specify a configuration when running NMAKE
 !MESSAGE by defining the macro CFG on the command line. For example:
-!MESSAGE 
+!MESSAGE
 !MESSAGE NMAKE /f "tcl.mak" CFG="tcl - Win32 Debug Static"
-!MESSAGE 
+!MESSAGE
 !MESSAGE Possible choices for configuration are:
-!MESSAGE 
+!MESSAGE
 !MESSAGE "tcl - Win32 Release" (based on "Win32 (x86) External Target")
 !MESSAGE "tcl - Win32 Debug" (based on "Win32 (x86) External Target")
 !MESSAGE "tcl - Win32 Debug Static" (based on "Win32 (x86) External Target")
 !MESSAGE "tcl - Win32 Release Static" (based on "Win32 (x86) External Target")
-!MESSAGE 
+!MESSAGE
 
 # Begin Project
 # PROP AllowPerConfigDependencies 0
@@ -112,7 +112,7 @@ CFG=tcl - Win32 Debug Static
 # PROP Bsc_Name ""
 # PROP Target_Dir ""
 
-!ENDIF 
+!ENDIF
 
 # Begin Target
 
@@ -129,7 +129,7 @@ CFG=tcl - Win32 Debug Static
 
 !ELSEIF  "$(CFG)" == "tcl - Win32 Release Static"
 
-!ENDIF 
+!ENDIF
 
 # Begin Group "compat"
 
@@ -1288,7 +1288,15 @@ SOURCE=..\generic\tclStubLib.c
 # End Source File
 # Begin Source File
 
-SOURCE=..\generic\tclStubLibDl.c
+SOURCE=..\generic\tclStubFindExecutable.c
+# End Source File
+# Begin Source File
+
+SOURCE=..\generic\tclStubInitSubsystems.c
+# End Source File
+# Begin Source File
+
+SOURCE=..\generic\tclStubSetPanicProc.c
 # End Source File
 # Begin Source File
 
diff --git a/win/tclAppInit.c b/win/tclAppInit.c
index 3292335..5820723 100644
--- a/win/tclAppInit.c
+++ b/win/tclAppInit.c
@@ -205,7 +205,7 @@ Tcl_AppInit(
      * user-specific startup file will be run under any conditions.
      */
 
-    (Tcl_ObjSetVar2)(interp, Tcl_NewStringObj("tcl_rcFileName", -1), NULL,
+    Tcl_ObjSetVar2(interp, Tcl_NewStringObj("tcl_rcFileName", -1), NULL,
 	    Tcl_NewStringObj("~/tclshrc.tcl", -1), TCL_GLOBAL_ONLY);
     return TCL_OK;
 }
-- 
cgit v0.12


From 594b14d3e3b65d3dea5188a3af6b7a2bfcbeda19 Mon Sep 17 00:00:00 2001
From: "jan.nijtmans" <nijtmans@users.sourceforge.net>
Date: Tue, 1 Oct 2019 14:57:09 +0000
Subject: Fix handling of BUILD_STATIC

---
 generic/tcl.h    | 2 +-
 unix/Makefile.in | 2 +-
 win/Makefile.in  | 2 +-
 win/tclAppInit.c | 1 -
 4 files changed, 3 insertions(+), 4 deletions(-)

diff --git a/generic/tcl.h b/generic/tcl.h
index 9598870..5af0a3d 100644
--- a/generic/tcl.h
+++ b/generic/tcl.h
@@ -2260,7 +2260,7 @@ extern const char *TclStubCall(int flags, void *arg1, void *arg2);
     EXTERN TCL_NORETURN void Tcl_MainExW(int argc, wchar_t **argv,
 	    Tcl_AppInitProc *appInitProc, Tcl_Interp *interp);
 #endif
-#ifdef USE_TCL_STUBS
+#if defined(USE_TCL_STUBS) && !defined(STATIC_BUILD)
 #define Tcl_InitSubsystems() \
     TclInitStubTable(TclStubCall(0, NULL, NULL))
 #define Tcl_FindExecutable(argv0) \
diff --git a/unix/Makefile.in b/unix/Makefile.in
index 2fe0bd6..1b74aeb 100644
--- a/unix/Makefile.in
+++ b/unix/Makefile.in
@@ -1100,7 +1100,7 @@ tclTestInit.o: $(UNIX_DIR)/tclAppInit.c ${TCL_EXE}
 	fi
 	$(CC) -c $(APP_CC_SWITCHES) \
 		-DTCL_BUILDTIME_LIBRARY="\"${TCL_BUILDTIME_LIBRARY}\"" \
-		-DTCL_TEST $(UNIX_DIR)/tclAppInit.c
+		-DTCL_TEST -DUSE_TCL_STUBS $(UNIX_DIR)/tclAppInit.c
 	@rm -f tclTestInit.o
 	mv tclAppInit.o tclTestInit.o
 	@if test -f tclAppInit.sav ; then \
diff --git a/win/Makefile.in b/win/Makefile.in
index 08f9e6a..f6bb954 100644
--- a/win/Makefile.in
+++ b/win/Makefile.in
@@ -625,7 +625,7 @@ ${ZLIB_DLL_FILE}: ${TCL_STUB_LIB_FILE}
 # Special case object targets
 
 tclTestMain.${OBJEXT}: tclAppInit.c
-	$(CC) -c $(CC_SWITCHES) -DTCL_TEST -DUNICODE -D_UNICODE $(EXTFLAGS) @DEPARG@ $(CC_OBJNAME)
+	$(CC) -c $(CC_SWITCHES) -DTCL_TEST -DUNICODE -D_UNICODE -DUSE_TCL_STUBS $(EXTFLAGS) @DEPARG@ $(CC_OBJNAME)
 
 tclWinInit.${OBJEXT}: tclWinInit.c
 	$(CC) -c $(CC_SWITCHES) -DBUILD_tcl $(EXTFLAGS) @DEPARG@ $(CC_OBJNAME)
diff --git a/win/tclAppInit.c b/win/tclAppInit.c
index 6ba57de..5820723 100644
--- a/win/tclAppInit.c
+++ b/win/tclAppInit.c
@@ -14,7 +14,6 @@
  * this file, and for a DISCLAIMER OF ALL WARRANTIES.
  */
 
-#define USE_TCL_STUBS
 #include "tcl.h"
 #define WIN32_LEAN_AND_MEAN
 #define STRICT			/* See MSDN Article Q83456 */
-- 
cgit v0.12


From 995453e1a0afa8b6b073e157677ffe6d89b3de6f Mon Sep 17 00:00:00 2001
From: "jan.nijtmans" <nijtmans@users.sourceforge.net>
Date: Tue, 1 Oct 2019 15:04:38 +0000
Subject: further fix handling -DBUILD_STATIC

---
 generic/tclStubLibTbl.c | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/generic/tclStubLibTbl.c b/generic/tclStubLibTbl.c
index 37b6856..cc1bb89 100644
--- a/generic/tclStubLibTbl.c
+++ b/generic/tclStubLibTbl.c
@@ -35,6 +35,12 @@ TclInitStubTable(
 	                        structure variable. */
 {
     if (version) {
+	if (tclStubsHandle == NULL) {
+		/* This can only happen with -DBUILD_STATIC, so simulate
+		 * that the loading of Tcl succeeded, although we didn't
+		 * actually loaded it dynamically */
+	    tclStubsHandle = (void *)1;
+	}
 	tclStubsPtr = ((const TclStubs **) version)[-1];
 
 	if (tclStubsPtr->hooks) {
-- 
cgit v0.12


From 04cd73a528530bb02e4b94162006f34751cbdd13 Mon Sep 17 00:00:00 2001
From: "jan.nijtmans" <nijtmans@users.sourceforge.net>
Date: Tue, 10 Mar 2020 15:58:27 +0000
Subject: re-generate configure scripts

---
 unix/configure | 14 +-------------
 win/configure  | 14 +-------------
 2 files changed, 2 insertions(+), 26 deletions(-)

diff --git a/unix/configure b/unix/configure
index c81cef3..8fa6e42 100755
--- a/unix/configure
+++ b/unix/configure
@@ -744,7 +744,6 @@ infodir
 docdir
 oldincludedir
 includedir
-runstatedir
 localstatedir
 sharedstatedir
 sysconfdir
@@ -834,7 +833,6 @@ datadir='${datarootdir}'
 sysconfdir='${prefix}/etc'
 sharedstatedir='${prefix}/com'
 localstatedir='${prefix}/var'
-runstatedir='${localstatedir}/run'
 includedir='${prefix}/include'
 oldincludedir='/usr/include'
 docdir='${datarootdir}/doc/${PACKAGE_TARNAME}'
@@ -1087,15 +1085,6 @@ do
   | -silent | --silent | --silen | --sile | --sil)
     silent=yes ;;
 
-  -runstatedir | --runstatedir | --runstatedi | --runstated \
-  | --runstate | --runstat | --runsta | --runst | --runs \
-  | --run | --ru | --r)
-    ac_prev=runstatedir ;;
-  -runstatedir=* | --runstatedir=* | --runstatedi=* | --runstated=* \
-  | --runstate=* | --runstat=* | --runsta=* | --runst=* | --runs=* \
-  | --run=* | --ru=* | --r=*)
-    runstatedir=$ac_optarg ;;
-
   -sbindir | --sbindir | --sbindi | --sbind | --sbin | --sbi | --sb)
     ac_prev=sbindir ;;
   -sbindir=* | --sbindir=* | --sbindi=* | --sbind=* | --sbin=* \
@@ -1233,7 +1222,7 @@ fi
 for ac_var in	exec_prefix prefix bindir sbindir libexecdir datarootdir \
 		datadir sysconfdir sharedstatedir localstatedir includedir \
 		oldincludedir docdir infodir htmldir dvidir pdfdir psdir \
-		libdir localedir mandir runstatedir
+		libdir localedir mandir
 do
   eval ac_val=\$$ac_var
   # Remove trailing slashes.
@@ -1386,7 +1375,6 @@ Fine tuning of the installation directories:
   --sysconfdir=DIR        read-only single-machine data [PREFIX/etc]
   --sharedstatedir=DIR    modifiable architecture-independent data [PREFIX/com]
   --localstatedir=DIR     modifiable single-machine data [PREFIX/var]
-  --runstatedir=DIR       modifiable per-process data [LOCALSTATEDIR/run]
   --libdir=DIR            object code libraries [EPREFIX/lib]
   --includedir=DIR        C header files [PREFIX/include]
   --oldincludedir=DIR     C header files for non-gcc [/usr/include]
diff --git a/win/configure b/win/configure
index 00ec899..6ceae65 100755
--- a/win/configure
+++ b/win/configure
@@ -756,7 +756,6 @@ infodir
 docdir
 oldincludedir
 includedir
-runstatedir
 localstatedir
 sharedstatedir
 sysconfdir
@@ -834,7 +833,6 @@ datadir='${datarootdir}'
 sysconfdir='${prefix}/etc'
 sharedstatedir='${prefix}/com'
 localstatedir='${prefix}/var'
-runstatedir='${localstatedir}/run'
 includedir='${prefix}/include'
 oldincludedir='/usr/include'
 docdir='${datarootdir}/doc/${PACKAGE}'
@@ -1087,15 +1085,6 @@ do
   | -silent | --silent | --silen | --sile | --sil)
     silent=yes ;;
 
-  -runstatedir | --runstatedir | --runstatedi | --runstated \
-  | --runstate | --runstat | --runsta | --runst | --runs \
-  | --run | --ru | --r)
-    ac_prev=runstatedir ;;
-  -runstatedir=* | --runstatedir=* | --runstatedi=* | --runstated=* \
-  | --runstate=* | --runstat=* | --runsta=* | --runst=* | --runs=* \
-  | --run=* | --ru=* | --r=*)
-    runstatedir=$ac_optarg ;;
-
   -sbindir | --sbindir | --sbindi | --sbind | --sbin | --sbi | --sb)
     ac_prev=sbindir ;;
   -sbindir=* | --sbindir=* | --sbindi=* | --sbind=* | --sbin=* \
@@ -1233,7 +1222,7 @@ fi
 for ac_var in	exec_prefix prefix bindir sbindir libexecdir datarootdir \
 		datadir sysconfdir sharedstatedir localstatedir includedir \
 		oldincludedir docdir infodir htmldir dvidir pdfdir psdir \
-		libdir localedir mandir runstatedir
+		libdir localedir mandir
 do
   eval ac_val=\$$ac_var
   # Remove trailing slashes.
@@ -1386,7 +1375,6 @@ Fine tuning of the installation directories:
   --sysconfdir=DIR        read-only single-machine data [PREFIX/etc]
   --sharedstatedir=DIR    modifiable architecture-independent data [PREFIX/com]
   --localstatedir=DIR     modifiable single-machine data [PREFIX/var]
-  --runstatedir=DIR       modifiable per-process data [LOCALSTATEDIR/run]
   --libdir=DIR            object code libraries [EPREFIX/lib]
   --includedir=DIR        C header files [PREFIX/include]
   --oldincludedir=DIR     C header files for non-gcc [/usr/include]
-- 
cgit v0.12


From 2a86d543545b1902bc81b6ad393d4c51fbecf402 Mon Sep 17 00:00:00 2001
From: "jan.nijtmans" <nijtmans@users.sourceforge.net>
Date: Wed, 21 Oct 2020 15:33:24 +0000
Subject: Finish correct implementation of stubbed TclZipfs_AppHook. Looks like
 complete now.

---
 doc/zipfs.3             |  3 ++-
 generic/tcl.h           | 18 +++++++++---------
 unix/dltest/Makefile.in |  2 +-
 unix/dltest/embtest.c   | 35 ++++++++++++++++++++++++++++++-----
 4 files changed, 42 insertions(+), 16 deletions(-)

diff --git a/doc/zipfs.3 b/doc/zipfs.3
index 348557f..f810ec9 100644
--- a/doc/zipfs.3
+++ b/doc/zipfs.3
@@ -10,6 +10,7 @@
 .so man.macros
 .BS
 .SH NAME
+const char *
 TclZipfs_AppHook, Tclzipfs_Mount, TclZipfs_MountBuffer, Tclzipfs_Unmount \- handle ZIP files as Tcl virtual filesystems
 .SH SYNOPSIS
 .nf
@@ -87,7 +88,7 @@ it uses WCHAR instead of char. As a result, it requires your application to
 be compiled with the UNICODE preprocessor symbol defined (e.g., via the
 \fB-DUNICODE\fR compiler flag).
 .PP
-The result of \fBTclZipfs_AppHook\fR is a Tcl result code (e.g., \fBTCL_OK\fR
+The result of \fBTclZipfs_AppHook\fR is the Tcl version string(e.g., \fB"9.0"\fR
 when the function is successful). The function \fImay\fR modify the variables
 pointed to by \fIargcPtr\fR and \fIargvPtr\fR to remove arguments; the
 current implementation does not do so, but callers \fIshould not\fR assume
diff --git a/generic/tcl.h b/generic/tcl.h
index fe73018..653fc6f 100644
--- a/generic/tcl.h
+++ b/generic/tcl.h
@@ -2215,22 +2215,22 @@ extern void *TclStubCall(void *arg);
 #define Tcl_SetPanicProc(panicProc) \
     TclInitStubTable(((const char *(*)(Tcl_PanicProc *))TclStubCall((void *)panicProc))(panicProc))
 #define Tcl_InitSubsystems() \
-    TclInitStubTable(((const char *(*)(void))TclStubCall(INT2PTR(1)))())
+    TclInitStubTable(((const char *(*)(void))TclStubCall((void *)1))())
 #define Tcl_FindExecutable(argv0) \
-    TclInitStubTable(((const char *(*)(const char *))TclStubCall(INT2PTR(1)))(argv0))
+    TclInitStubTable(((const char *(*)(const char *))TclStubCall((void *)2))(argv0))
 #if !defined(_WIN32) || !defined(UNICODE)
 #define Tcl_MainEx(argc, argv, appInitProc, interp) \
-	((void(*)(int, const void *, Tcl_AppInitProc *, Tcl_Interp *)) \
-	TclStubCall(INT2PTR(3)))(argc, argv, appInitProc, interp)
+	(void)((void(*)(int, const void *, Tcl_AppInitProc *, Tcl_Interp *)) \
+	TclStubCall((void *)3))(argc, argv, appInitProc, interp)
 #endif
 #define Tcl_MainExW(argc, argv, appInitProc, interp) \
-	((void(*)(int, const void *, Tcl_AppInitProc *, Tcl_Interp *)) \
-	TclStubCall(INT2PTR(4)))(argc, argv, appInitProc, interp)
+	(void)((const char *(*)(int, const void *, Tcl_AppInitProc *, Tcl_Interp *)) \
+	TclStubCall((void *)4))(argc, argv, appInitProc, interp)
 #define Tcl_StaticPackage(interp, pkgName, initProc, safeInitProc) \
-	((void(*)(Tcl_Interp *, const char *, Tcl_PackageInitProc *, Tcl_PackageInitProc *)) \
-	TclStubCall(INT2PTR(5)))(interp, pkgName, initProc, safeInitProc)
+	((const char *(*)(Tcl_Interp *, const char *, Tcl_PackageInitProc *, Tcl_PackageInitProc *)) \
+	TclStubCall((void *)5))(interp, pkgName, initProc, safeInitProc)
 #define TclZipfs_AppHook(argcp, argvp) \
-    ((const char *(*)(int *, void *))TclStubCall(INT2PTR(6)))(argcp, argvp)
+	TclInitStubTable(((const char *(*)(int *, void *))TclStubCall((void *)6))(argcp, argvp))
 #endif
 
 /*
diff --git a/unix/dltest/Makefile.in b/unix/dltest/Makefile.in
index 165b859..dfee25a 100644
--- a/unix/dltest/Makefile.in
+++ b/unix/dltest/Makefile.in
@@ -57,7 +57,7 @@ pkgooa.o: $(SRC_DIR)/pkgooa.c
 	$(CC) -c $(CC_SWITCHES) $(SRC_DIR)/pkgooa.c
 
 embtest: embtest.o
-	$(SHLIB_LD) -o $@ embtest.o ${SHLIB_LD_LIBS} -lc
+	$(CC) -o $@ embtest.o ${SHLIB_LD_LIBS}
 
 pkga${SHLIB_SUFFIX}: pkga.o
 	${SHLIB_LD} -o $@ pkga.o ${SHLIB_LD_LIBS}
diff --git a/unix/dltest/embtest.c b/unix/dltest/embtest.c
index c6724c3..1111268 100644
--- a/unix/dltest/embtest.c
+++ b/unix/dltest/embtest.c
@@ -1,11 +1,36 @@
 #include "tcl.h"
 #include <stdio.h>
 
-int main() {
-    const char *version = Tcl_SetPanicProc(Tcl_ConsolePanic);
+MODULE_SCOPE const TclStubs *tclStubsPtr;
 
-    if (version != NULL) {
-    	printf("OK. version = %s\n", version);
+int main(int argc, char **argv) {
+    const char *version;
+    int exitcode = 0;
+
+    if (tclStubsPtr != NULL) {
+	printf("ERROR: stub table is already initialized");
+	exitcode = 1;
+    }
+    tclStubsPtr = NULL;
+    version = Tcl_SetPanicProc(Tcl_ConsolePanic);
+    if (tclStubsPtr == NULL) {
+	printf("ERROR: Tcl_SetPanicProc does not initialize the stub table\n");
+	exitcode = 1;
+    }
+    tclStubsPtr = NULL;
+    version = Tcl_InitSubsystems();
+    if (tclStubsPtr == NULL) {
+	printf("ERROR: Tcl_InitSubsystems does not initialize the stub table\n");
+	exitcode = 1;
+    }
+    tclStubsPtr = NULL;
+    version = Tcl_FindExecutable(argv[0]);
+    if (tclStubsPtr == NULL) {
+	printf("ERROR: Tcl_FindExecutable does not initialize the stub table\n");
+	exitcode = 1;
+    }
+    if (!exitcode) {
+    	printf("All OK!\n");
     }
-    return 0;
+    return exitcode;
 }
-- 
cgit v0.12


From b64263906d5ccdfc8d2eb75c1bccec3aacb898fa Mon Sep 17 00:00:00 2001
From: "jan.nijtmans" <nijtmans@users.sourceforge.net>
Date: Fri, 23 Oct 2020 15:44:08 +0000
Subject: Add 2 more supported funtions to TclStubCall()

---
 compat/zlib/win32/zlib1.dll | Bin
 compat/zlib/win64/zlib1.dll | Bin
 doc/zipfs.3                 |   3 +--
 generic/tcl.h               |  18 +++++++++++-------
 generic/tclStubCall.c       |  30 ++++++++++++++++++++----------
 5 files changed, 32 insertions(+), 19 deletions(-)
 mode change 100644 => 100755 compat/zlib/win32/zlib1.dll
 mode change 100644 => 100755 compat/zlib/win64/zlib1.dll

diff --git a/compat/zlib/win32/zlib1.dll b/compat/zlib/win32/zlib1.dll
old mode 100644
new mode 100755
diff --git a/compat/zlib/win64/zlib1.dll b/compat/zlib/win64/zlib1.dll
old mode 100644
new mode 100755
diff --git a/doc/zipfs.3 b/doc/zipfs.3
index f810ec9..f1efc65 100644
--- a/doc/zipfs.3
+++ b/doc/zipfs.3
@@ -10,11 +10,10 @@
 .so man.macros
 .BS
 .SH NAME
-const char *
 TclZipfs_AppHook, Tclzipfs_Mount, TclZipfs_MountBuffer, Tclzipfs_Unmount \- handle ZIP files as Tcl virtual filesystems
 .SH SYNOPSIS
 .nf
-int
+const char *
 \fBTclZipfs_AppHook(\fIargcPtr, argvPtr\fR)
 .sp
 int
diff --git a/generic/tcl.h b/generic/tcl.h
index 1d6dad0..0c75a4e 100644
--- a/generic/tcl.h
+++ b/generic/tcl.h
@@ -2218,19 +2218,23 @@ extern void *TclStubCall(void *arg);
     TclInitStubTable(((const char *(*)(void))TclStubCall((void *)1))())
 #define Tcl_FindExecutable(argv0) \
     TclInitStubTable(((const char *(*)(const char *))TclStubCall((void *)2))(argv0))
+#define TclZipfs_AppHook(argcp, argvp) \
+	TclInitStubTable(((const char *(*)(int *, void *))TclStubCall((void *)3))(argcp, argvp))
+#define Tcl_MainExW(argc, argv, appInitProc, interp) \
+	(void)((const char *(*)(int, const void *, Tcl_AppInitProc *, Tcl_Interp *)) \
+	TclStubCall((void *)4))(argc, argv, appInitProc, interp)
 #if !defined(_WIN32) || !defined(UNICODE)
 #define Tcl_MainEx(argc, argv, appInitProc, interp) \
 	(void)((const char *(*)(int, const void *, Tcl_AppInitProc *, Tcl_Interp *)) \
-	TclStubCall((void *)3))(argc, argv, appInitProc, interp)
+	TclStubCall((void *)5))(argc, argv, appInitProc, interp)
 #endif
-#define Tcl_MainExW(argc, argv, appInitProc, interp) \
-	(void)((const char *(*)(int, const void *, Tcl_AppInitProc *, Tcl_Interp *)) \
-	TclStubCall((void *)4))(argc, argv, appInitProc, interp)
 #define Tcl_StaticPackage(interp, pkgName, initProc, safeInitProc) \
 	(void)((const char *(*)(Tcl_Interp *, const char *, Tcl_PackageInitProc *, Tcl_PackageInitProc *)) \
-	TclStubCall((void *)5))(interp, pkgName, initProc, safeInitProc)
-#define TclZipfs_AppHook(argcp, argvp) \
-	TclInitStubTable(((const char *(*)(int *, void *))TclStubCall((void *)6))(argcp, argvp))
+	TclStubCall((void *)6))(interp, pkgName, initProc, safeInitProc)
+#define Tcl_SetExitProc(proc) \
+	((Tcl_ExitProc *(*)(Tcl_ExitProc *))TclStubCall((void *)7))(proc)
+#define Tcl_GetMemoryInfo(dsPtr) \
+	(void)((const char *(*)(Tcl_DString *))TclStubCall((void *)8))(dsPtr)
 #endif
 
 /*
diff --git a/generic/tclStubCall.c b/generic/tclStubCall.c
index da8d47a..0036e3a 100644
--- a/generic/tclStubCall.c
+++ b/generic/tclStubCall.c
@@ -21,22 +21,32 @@ MODULE_SCOPE void *tclStubsHandle;
  *
  * TclStubCall --
  *
- *	Load the Tcl core dynamically, version "9.0" (or higher, in future versions)
+ *	Load the Tcl core dynamically, version "9.0" (or higher, in future versions).
  *
  * Results:
- *	Outputs a function returning the value of the "version" argument or NULL.
+ *	Returns a function from the Tcl dynamic library or a function
+ *	returning NULL if that function cannot be found. See PROCNAME table.
+ *
+ *	The functions Tcl_MainEx and Tcl_MainExW never return.
+ *	Tcl_GetMemoryInfo and Tcl_StaticPackage return (void) and
+ *	Tcl_SetExitProc returns its previous exitProc. This means that
+ *	those 5 functions cannot be used to initialize the stub-table,
+ *	only the first 4 functions in the table can do that.
  *
  *----------------------------------------------------------------------
  */
 
+/* Table containing which function will be returned, depending on the "arg" */
 static const char PROCNAME[][24] = {
-    "_Tcl_SetPanicProc",
-    "_Tcl_InitSubsystems",
-    "_Tcl_FindExecutable",
-    "_Tcl_MainEx",
-    "_Tcl_MainExW",
-    "_Tcl_StaticPackage",
-    "_TclZipfs_AppHook"
+    "_Tcl_SetPanicProc", /* Default, whenever "arg" <= 0 or "arg" > 8 */
+    "_Tcl_InitSubsystems", /* "arg" == (void *)1 */
+    "_Tcl_FindExecutable", /* "arg" == (void *)2 */
+    "_TclZipfs_AppHook", /* "arg" == (void *)3 */
+    "_Tcl_MainExW", /* "arg" == (void *)4 */
+    "_Tcl_MainEx", /* "arg" == (void *)5 */
+    "_Tcl_StaticPackage", /* "arg" == (void *)6 */
+    "_Tcl_SetExitProc", /* "arg" == (void *)7 */
+    "_Tcl_GetMemoryInfo" /* "arg" == (void *)8 */
 };
 
 MODULE_SCOPE const void *nullVersionProc(void) {
@@ -52,7 +62,7 @@ TclStubCall(void *arg)
     static void *stubFn[] = {NULL,NULL,NULL,NULL,NULL,NULL,NULL};
     unsigned index = PTR2UINT(arg);
 
-    if (index > 6) {
+    if (index > sizeof(PROCNAME)/sizeof(PROCNAME[0])) {
 	/* Any other value means Tcl_SetPanicProc() with non-null panicProc */
 	index = 0;
     }
-- 
cgit v0.12


From 9bf0f01d3d518909dba4fddd22b5eefdad229a83 Mon Sep 17 00:00:00 2001
From: "jan.nijtmans" <nijtmans@users.sourceforge.net>
Date: Sun, 25 Oct 2020 19:27:54 +0000
Subject: Fix (g++) Travis build

---
 generic/tclStubCall.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/generic/tclStubCall.c b/generic/tclStubCall.c
index 42111a9..8fe7892 100644
--- a/generic/tclStubCall.c
+++ b/generic/tclStubCall.c
@@ -90,7 +90,7 @@ TclStubCall(void *arg)
 	if (!stubFn[index]) {
 	    stubFn[index] = dlsym(tclStubsHandle, PROCNAME[index]);
 	    if (!stubFn[index]) {
-		stubFn[index] = nullVersionProc;
+		stubFn[index] = (void *)nullVersionProc;
 	    }
 	}
     }
-- 
cgit v0.12


From bd8b8ff3b710e8ae5f4750eadc84c9d96c3ea4c7 Mon Sep 17 00:00:00 2001
From: "jan.nijtmans" <nijtmans@users.sourceforge.net>
Date: Wed, 24 Feb 2021 10:14:01 +0000
Subject: Final implementation tweaks, fix comments, allow Tcl to load from
 <prefix>/lib (or <prefix>/bin on win32/cygwin) even when this is not in your
 PATH.

---
 doc/zipfs.3             |  4 ++--
 generic/tclStubCall.c   | 22 ++++++++++++++++++----
 generic/tclStubLib.c    |  2 +-
 generic/tclStubLibTbl.c |  2 +-
 unix/Makefile.in        |  7 +++++--
 unix/configure.ac       |  4 ----
 win/Makefile.in         |  5 ++++-
 win/makefile.vc         |  5 ++++-
 8 files changed, 35 insertions(+), 16 deletions(-)

diff --git a/doc/zipfs.3 b/doc/zipfs.3
index f1efc65..2db6d67 100644
--- a/doc/zipfs.3
+++ b/doc/zipfs.3
@@ -87,8 +87,8 @@ it uses WCHAR instead of char. As a result, it requires your application to
 be compiled with the UNICODE preprocessor symbol defined (e.g., via the
 \fB-DUNICODE\fR compiler flag).
 .PP
-The result of \fBTclZipfs_AppHook\fR is the Tcl version string(e.g., \fB"9.0"\fR
-when the function is successful). The function \fImay\fR modify the variables
+The result of \fBTclZipfs_AppHook\fR is the full Tcl version string(e.g.,
+\fB"9.0.0"\fR). The function \fImay\fR modify the variables
 pointed to by \fIargcPtr\fR and \fIargvPtr\fR to remove arguments; the
 current implementation does not do so, but callers \fIshould not\fR assume
 that this will be true in the future.
diff --git a/generic/tclStubCall.c b/generic/tclStubCall.c
index 8fe7892..96e3837 100644
--- a/generic/tclStubCall.c
+++ b/generic/tclStubCall.c
@@ -59,7 +59,7 @@ static const char CANNOTFIND[] = "Cannot find %s: %s\n";
 MODULE_SCOPE void *
 TclStubCall(void *arg)
 {
-    static void *stubFn[] = {NULL,NULL,NULL,NULL,NULL,NULL,NULL};
+    static void *stubFn[] = {NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL};
     unsigned index = PTR2UINT(arg);
 
     if (index >= sizeof(PROCNAME)/sizeof(PROCNAME[0])) {
@@ -76,12 +76,26 @@ TclStubCall(void *arg)
     }
     if (!stubFn[index]) {
 	if (!tclStubsHandle) {
-	    tclStubsHandle = dlopen(TCL_DLL_FILE, RTLD_NOW|RTLD_LOCAL);
+	    tclStubsHandle = dlopen(CFG_RUNTIME_DLLFILE, RTLD_NOW|RTLD_LOCAL);
+	    if (!tclStubsHandle) {
+		tclStubsHandle = dlopen(
+#if defined(_WIN32) || defined(__CYGWIN__)
+			CFG_RUNTIME_BINDIR
+#else
+			CFG_RUNTIME_LIBDIR
+#endif
+#if defined(_WIN32)
+			"\\"
+#else
+			"/"
+#endif
+			CFG_RUNTIME_DLLFILE, RTLD_NOW|RTLD_LOCAL);
+	    }
 	    if (!tclStubsHandle) {
 		if ((index == 0) && (arg != NULL)) {
-		    ((Tcl_PanicProc *)arg)(CANNOTFIND, TCL_DLL_FILE, dlerror());
+		    ((Tcl_PanicProc *)arg)(CANNOTFIND, CFG_RUNTIME_DLLFILE, dlerror());
 		} else {
-		    fprintf(stderr, CANNOTFIND, TCL_DLL_FILE, dlerror());
+		    fprintf(stderr, CANNOTFIND, CFG_RUNTIME_DLLFILE, dlerror());
 		    abort();
 		}
 	    }
diff --git a/generic/tclStubLib.c b/generic/tclStubLib.c
index 32ca1f1..697d92f 100644
--- a/generic/tclStubLib.c
+++ b/generic/tclStubLib.c
@@ -109,7 +109,7 @@ Tcl_InitStubs(
 	stubsPtr = (TclStubs *)pkgData;
     }
     if (tclStubsHandle == NULL) {
-	tclStubsHandle = (void *) -1;
+	tclStubsHandle = INT2PTR(-1);
     }
     tclStubsPtr = stubsPtr;
 
diff --git a/generic/tclStubLibTbl.c b/generic/tclStubLibTbl.c
index 32b3869..ad34494 100644
--- a/generic/tclStubLibTbl.c
+++ b/generic/tclStubLibTbl.c
@@ -40,7 +40,7 @@ TclInitStubTable(
 	if (tclStubsHandle == NULL) {
 		/* This can only happen with -DBUILD_STATIC, so simulate
 		 * that the loading of Tcl succeeded, although we didn't
-		 * actually loaded it dynamically */
+		 * actually load it dynamically */
 	    tclStubsHandle = (void *)1;
 	}
 	tclStubsPtr = ((const TclStubs **) version)[-1];
diff --git a/unix/Makefile.in b/unix/Makefile.in
index 4e7b06c..936f2f2 100644
--- a/unix/Makefile.in
+++ b/unix/Makefile.in
@@ -201,7 +201,6 @@ BUILD_DLTEST		= @BUILD_DLTEST@
 
 TCL_LIB_FILE		= @TCL_LIB_FILE@
 #TCL_LIB_FILE		= libtcl.a
-TCL_PREV_LIB_FILE		= @TCL_PREV_LIB_FILE@
 
 # Generic lib name used in rules that apply to tcl and tk
 LIB_FILE		= ${TCL_LIB_FILE}
@@ -1914,7 +1913,11 @@ tclStubLib.o: $(GENERIC_DIR)/tclStubLib.c
 	$(CC) -c $(STUB_CC_SWITCHES) -DSTATIC_BUILD @CFLAGS_NOLTO@ $(GENERIC_DIR)/tclStubLib.c
 
 tclStubCall.o: $(GENERIC_DIR)/tclStubCall.c
-	$(CC) -c $(STUB_CC_SWITCHES) -DSTATIC_BUILD -DTCL_DLL_FILE="\"$(TCL_LIB_FILE)\"" $(GENERIC_DIR)/tclStubCall.c
+	$(CC) -c $(STUB_CC_SWITCHES) -DSTATIC_BUILD \
+		-DCFG_RUNTIME_DLLFILE="\"$(TCL_LIB_FILE)\"" \
+		-DCFG_RUNTIME_LIBDIR="\"$(libdir)\"" \
+		-DCFG_RUNTIME_BINDIR="\"$(bindir)\"" \
+		$(GENERIC_DIR)/tclStubCall.c
 
 tclStubLibTbl.o: $(GENERIC_DIR)/tclStubLibTbl.c
 	$(CC) -c $(STUB_CC_SWITCHES) -DSTATIC_BUILD $(GENERIC_DIR)/tclStubLibTbl.c
diff --git a/unix/configure.ac b/unix/configure.ac
index 08aa2b3..685a335 100644
--- a/unix/configure.ac
+++ b/unix/configure.ac
@@ -864,9 +864,6 @@ else
     TCL_BUILD_LIB_SPEC="-L`pwd | sed -e 's/ /\\\\ /g'` ${TCL_LIB_FLAG}"
     TCL_LIB_SPEC="-L${libdir} ${TCL_LIB_FLAG}"
 fi
-VERSION='8.5'
-eval "TCL_PREV_LIB_FILE=libtcl${TCL_SHARED_LIB_SUFFIX}"
-eval "TCL_PREV_LIB_FILE=${TCL_PREV_LIB_FILE}"
 VERSION='${VERSION}'
 eval "CFG_TCL_SHARED_LIB_SUFFIX=${TCL_SHARED_LIB_SUFFIX}"
 eval "CFG_TCL_UNSHARED_LIB_SUFFIX=${TCL_UNSHARED_LIB_SUFFIX}"
@@ -974,7 +971,6 @@ AC_SUBST(PKG_CFG_ARGS)
 
 AC_SUBST(TCL_ZIP_FILE)
 AC_SUBST(TCL_LIB_FILE)
-AC_SUBST(TCL_PREV_LIB_FILE)
 AC_SUBST(TCL_LIB_FLAG)
 AC_SUBST(TCL_LIB_SPEC)
 AC_SUBST(TCL_STUB_LIB_FILE)
diff --git a/win/Makefile.in b/win/Makefile.in
index 57cb7ef..1ce1c9d 100644
--- a/win/Makefile.in
+++ b/win/Makefile.in
@@ -682,7 +682,10 @@ tclStubLib.${OBJEXT}: tclStubLib.c
 	$(CC) -c $(CC_SWITCHES) -DSTATIC_BUILD @CFLAGS_NOLTO@ @DEPARG@ $(CC_OBJNAME)
 
 tclStubCall.${OBJEXT}: tclStubCall.c
-	$(CC) -c $(CC_SWITCHES) -DSTATIC_BUILD -DTCL_DLL_FILE="\"$(TCL_DLL_FILE)\"" @DEPARG@ $(CC_OBJNAME)
+	$(CC) -c $(CC_SWITCHES) -DSTATIC_BUILD \
+		-DCFG_RUNTIME_DLLFILE="\"$(TCL_DLL_FILE)\"" \
+		-DCFG_RUNTIME_BINDIR="\"$(bindir_native)\"" \
+		@DEPARG@ $(CC_OBJNAME)
 
 tclStubLibTbl.${OBJEXT}: tclStubLibTbl.c
 	$(CC) -c $(CC_SWITCHES) -DSTATIC_BUILD @DEPARG@ $(CC_OBJNAME)
diff --git a/win/makefile.vc b/win/makefile.vc
index 67c7c36..03a4419 100644
--- a/win/makefile.vc
+++ b/win/makefile.vc
@@ -864,7 +864,10 @@ $(TMP_DIR)\tclStubLib.obj: $(GENERICDIR)\tclStubLib.c
 	$(cc32) $(stubscflags) -Fo$@ $?
 
 $(TMP_DIR)\tclStubCall.obj: $(GENERICDIR)\tclStubCall.c
-	$(cc32) $(stubscflags) -DTCL_DLL_FILE="\"tcl$(TCL_VERSION)$(SUFX:t=).dll\"" $(TCL_INCLUDES) -Fo$@ $?
+	$(cc32) $(stubscflags) \
+		/DCFG_RUNTIME_DLLFILE="\"$(TCLLIBNAME)\"" \
+		/DCFG_RUNTIME_BINDIR="\"$(BIN_INSTALL_DIR:\=\\)\"" \
+		$(TCL_INCLUDES) -Fo$@ $?
 
 $(TMP_DIR)\tclStubLibTbl.obj: $(GENERICDIR)\tclStubLibTbl.c
 	$(cc32) $(stubscflags) $(TCL_INCLUDES) -Fo$@ $?
-- 
cgit v0.12


From 6eb27e1aaa13ae6877fde25f4d1f2110e2809cde Mon Sep 17 00:00:00 2001
From: "jan.nijtmans" <nijtmans@users.sourceforge.net>
Date: Fri, 26 Feb 2021 09:10:49 +0000
Subject: Try to fix Visual Studio build

---
 generic/tclStubCall.c | 15 +++++----------
 1 file changed, 5 insertions(+), 10 deletions(-)

diff --git a/generic/tclStubCall.c b/generic/tclStubCall.c
index 96e3837..8ec3155 100644
--- a/generic/tclStubCall.c
+++ b/generic/tclStubCall.c
@@ -60,7 +60,7 @@ MODULE_SCOPE void *
 TclStubCall(void *arg)
 {
     static void *stubFn[] = {NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL};
-    unsigned index = PTR2UINT(arg);
+    size_t index = PTR2UINT(arg);
 
     if (index >= sizeof(PROCNAME)/sizeof(PROCNAME[0])) {
 	/* Any other value means Tcl_SetPanicProc() with non-null panicProc */
@@ -78,18 +78,13 @@ TclStubCall(void *arg)
 	if (!tclStubsHandle) {
 	    tclStubsHandle = dlopen(CFG_RUNTIME_DLLFILE, RTLD_NOW|RTLD_LOCAL);
 	    if (!tclStubsHandle) {
-		tclStubsHandle = dlopen(
-#if defined(_WIN32) || defined(__CYGWIN__)
-			CFG_RUNTIME_BINDIR
-#else
-			CFG_RUNTIME_LIBDIR
-#endif
 #if defined(_WIN32)
-			"\\"
+		tclStubsHandle = dlopen(CFG_RUNTIME_BINDIR "\\" CFG_RUNTIME_DLLFILE, RTLD_NOW|RTLD_LOCAL);
+#elif defined(__CYGWIN__)
+		tclStubsHandle = dlopen(CFG_RUNTIME_BINDIR "/" CFG_RUNTIME_DLLFILE, RTLD_NOW|RTLD_LOCAL);
 #else
-			"/"
+		tclStubsHandle = dlopen(CFG_RUNTIME_LIBDIR "/" CFG_RUNTIME_DLLFILE, RTLD_NOW|RTLD_LOCAL);
 #endif
-			CFG_RUNTIME_DLLFILE, RTLD_NOW|RTLD_LOCAL);
 	    }
 	    if (!tclStubsHandle) {
 		if ((index == 0) && (arg != NULL)) {
-- 
cgit v0.12


From 78c53b37ab0bf3c76d498a839f6659235efff3cd Mon Sep 17 00:00:00 2001
From: "jan.nijtmans" <nijtmans@users.sourceforge.net>
Date: Sun, 4 Apr 2021 15:35:13 +0000
Subject: Implement support for Tcl_SetPreInitScript()

---
 generic/tcl.h         |  2 ++
 generic/tclStubCall.c | 10 ++++++----
 2 files changed, 8 insertions(+), 4 deletions(-)

diff --git a/generic/tcl.h b/generic/tcl.h
index 6dd881d..faf0d49 100644
--- a/generic/tcl.h
+++ b/generic/tcl.h
@@ -2239,6 +2239,8 @@ extern void *TclStubCall(void *arg);
 	((Tcl_ExitProc *(*)(Tcl_ExitProc *))TclStubCall((void *)7))(proc)
 #define Tcl_GetMemoryInfo(dsPtr) \
 	(void)((const char *(*)(Tcl_DString *))TclStubCall((void *)8))(dsPtr)
+#define Tcl_SetPreInitScript(string) \
+	((const char *(*)(const char *))TclStubCall((void *)9))(string)
 #endif
 
 /*
diff --git a/generic/tclStubCall.c b/generic/tclStubCall.c
index 0eb46b6..e0d85a6 100644
--- a/generic/tclStubCall.c
+++ b/generic/tclStubCall.c
@@ -28,9 +28,10 @@ MODULE_SCOPE void *tclStubsHandle;
  *	returning NULL if that function cannot be found. See PROCNAME table.
  *
  *	The functions Tcl_MainEx and Tcl_MainExW never return.
- *	Tcl_GetMemoryInfo and Tcl_StaticLibrary return (void) and
- *	Tcl_SetExitProc returns its previous exitProc. This means that
- *	those 5 functions cannot be used to initialize the stub-table,
+ *	Tcl_GetMemoryInfo and Tcl_StaticLibrary return (void),
+ *	Tcl_SetExitProc returns its previous exitProc and
+ *	Tcl_SetPreInitScript returns the previous script. This means that
+ *	those 6 functions cannot be used to initialize the stub-table,
  *	only the first 4 functions in the table can do that.
  *
  *----------------------------------------------------------------------
@@ -46,7 +47,8 @@ static const char PROCNAME[][24] = {
     "_Tcl_MainEx", /* "arg" == (void *)5 */
     "_Tcl_StaticLibrary", /* "arg" == (void *)6 */
     "_Tcl_SetExitProc", /* "arg" == (void *)7 */
-    "_Tcl_GetMemoryInfo" /* "arg" == (void *)8 */
+    "_Tcl_GetMemoryInfo", /* "arg" == (void *)8 */
+    "_Tcl_SetPreInitScript" /* "arg" == (void *)9 */
 };
 
 MODULE_SCOPE const void *nullVersionProc(void) {
-- 
cgit v0.12


From 8ba69750a3d5b3706fb03205f59a64e6c7539663 Mon Sep 17 00:00:00 2001
From: oehhar <harald.oehlmann@elmicron.de>
Date: Fri, 16 Apr 2021 11:48:02 +0000
Subject: TIP596: Document Tcl_MainEx, Tcl_MainExW, Tcl_GetMemoryInfo,
 Tcl_SetPreInitScript

---
 doc/Alloc.3    | 13 +++++++++++--
 doc/Init.3     | 14 +++++++++++++-
 doc/Tcl_Main.3 | 14 +++++++++++++-
 3 files changed, 37 insertions(+), 4 deletions(-)

diff --git a/doc/Alloc.3 b/doc/Alloc.3
index 849f65e..c3c3f11 100644
--- a/doc/Alloc.3
+++ b/doc/Alloc.3
@@ -4,11 +4,11 @@
 '\" See the file "license.terms" for information on usage and redistribution
 '\" of this file, and for a DISCLAIMER OF ALL WARRANTIES.
 '\"
-.TH Tcl_Alloc 3 7.5 Tcl "Tcl Library Procedures"
+.TH Tcl_Alloc 3 9.0 Tcl "Tcl Library Procedures"
 .so man.macros
 .BS
 .SH NAME
-Tcl_Alloc, Tcl_Free, Tcl_Realloc, Tcl_AttemptAlloc, Tcl_AttemptRealloc \- allocate or free heap memory
+Tcl_Alloc, Tcl_Free, Tcl_Realloc, Tcl_AttemptAlloc, Tcl_AttemptRealloc, Tcl_GetMemoryInfo \- allocate or free heap memory
 .SH SYNOPSIS
 .nf
 \fB#include <tcl.h>\fR
@@ -27,12 +27,17 @@ void *
 .sp
 void *
 \fBTcl_AttemptRealloc\fR(\fIptr, size\fR)
+.sp
+void
+\fBTcl_GetMemoryInfo\fR(\fIdsPtr\fR)
 .SH ARGUMENTS
 .AS char *size
 .AP "unsigned int" size in
 Size in bytes of the memory block to allocate.
 .AP char *ptr in
 Pointer to memory block to free or realloc.
+.AP Tcl_DString *dsPtr in
+Initialized DString pointer.
 .BE
 
 .SH DESCRIPTION
@@ -69,5 +74,9 @@ the procedures \fBTcl_Alloc\fR, \fBTcl_Free\fR, \fBTcl_Realloc\fR,
 \fBTcl_AttemptAlloc\fR, and \fBTcl_AttempRealloc\fR are implemented
 as macros, redefined to be special debugging versions of these procedures.
 
+\fBTcl_GetMemoryInfo\fR appends a list-of-lists of memory stats to the provided DString.
+This procedure may be called when the TCL library is included within an embedded application.
+The stubs table must be first initialized using one of \fBTcl_InitSubsystems\fR, \fBTcl_SetPanicProc\fR, \fBTcl_FindExecutable\fR or \fBTclZipfs_AppHook\fR.
+
 .SH KEYWORDS
 alloc, allocation, free, malloc, memory, realloc, TCL_MEM_DEBUG
diff --git a/doc/Init.3 b/doc/Init.3
index d9fc2e1..fa87892 100644
--- a/doc/Init.3
+++ b/doc/Init.3
@@ -2,7 +2,7 @@
 '\" Copyright (c) 1998-2000 Scriptics Corporation.
 '\" All rights reserved.
 '\"
-.TH Tcl_Init 3 8.0 Tcl "Tcl Library Procedures"
+.TH Tcl_Init 3 9.0 Tcl "Tcl Library Procedures"
 .so man.macros
 .BS
 .SH NAME
@@ -13,10 +13,15 @@ Tcl_Init \- find and source initialization script
 .sp
 int
 \fBTcl_Init\fR(\fIinterp\fR)
+.sp
+const char *
+\fBTcl_SetPreInitScript\fR(\fIscriptPtr\fR)
 .SH ARGUMENTS
 .AS Tcl_Interp *interp
 .AP Tcl_Interp *interp in
 Interpreter to initialize.
+.AP "const char" *scriptPtr in
+Address of the initialization script.
 .BE
 
 .SH DESCRIPTION
@@ -26,6 +31,13 @@ Interpreter to initialize.
 path.
 .PP
 \fBTcl_Init\fR is typically called from \fBTcl_AppInit\fR procedures.
+.PP
+\fBTcl_SetPreInitScript\fR registeres the pre-initialization script and returns the former (now replaced) script pointer.
+A value of \fINULL\fR may be passed to not register any script.
+The pre-initialization script is executed by \fBTcl_Init\fR before accessing the file system.
+The purpose is to typically prepare a custom file system (like an embedded zip-file) to be activated before the search.
+
+When the TCL library is loaded within an embedded application, the stubs table must be first initialized using one of \fBTcl_InitSubsystems\fR, \fBTcl_SetPanicProc\fR, \fBTcl_FindExecutable\fR or \fBTclZipfs_AppHook\fR before \fBTcl_SetPreInitScript\fR may be called.
 
 .SH "SEE ALSO"
 Tcl_AppInit, Tcl_Main
diff --git a/doc/Tcl_Main.3 b/doc/Tcl_Main.3
index 62ceeab..6ace8c9 100644
--- a/doc/Tcl_Main.3
+++ b/doc/Tcl_Main.3
@@ -6,7 +6,7 @@
 '\" See the file "license.terms" for information on usage and redistribution
 '\" of this file, and for a DISCLAIMER OF ALL WARRANTIES.
 '\"
-.TH Tcl_Main 3 8.4 Tcl "Tcl Library Procedures"
+.TH Tcl_Main 3 9.0 Tcl "Tcl Library Procedures"
 .so man.macros
 .BS
 .SH NAME
@@ -17,6 +17,10 @@ Tcl_Main, Tcl_SetStartupScript, Tcl_GetStartupScript, Tcl_SetMainLoop \- main pr
 .sp
 \fBTcl_Main\fR(\fIargc, argv, appInitProc\fR)
 .sp
+\fBTcl_MainEx\fR(\fIargc, charargv, appInitProc\fR)
+.sp
+\fBTcl_MainExW\fR(\fIargc, wideargv, appInitProc\fR)
+.sp
 \fBTcl_SetStartupScript\fR(\fIpath, encoding\fR)
 .sp
 Tcl_Obj *
@@ -30,6 +34,10 @@ Number of elements in \fIargv\fR.
 .AP char *argv[] in
 Array of strings containing command-line arguments. On Windows, when
 using -DUNICODE, the parameter type changes to wchar_t *.
+.AP char *charargv[] in
+As argv, but does not change type to wchar_t.
+.AP char *wideargv[] in
+As argv, but type is always wchar_t.
 .AP Tcl_AppInitProc *appInitProc in
 Address of an application-specific initialization procedure.
 The value for this argument is usually \fBTcl_AppInit\fR.
@@ -191,6 +199,10 @@ procedure (if any) returns, \fBTcl_Main\fR will also evaluate
 the \fBexit\fR command.
 .PP
 \fBTcl_Main\fR can not be used in stub-enabled extensions.
+.PP
+When the TCL library is loaded within an embedded application, \fBTcl_MainEx\fR or \fBTcl_MainExW\fR may be used to call \fBTcl_Main\fR.
+The difference between Tcl_MainEx and Tcl_MainExW is that the arguments are passed as characters or wide characters.
+Remark that the stubs table must be first initialized using one of \fBTcl_InitSubsystems\fR, \fBTcl_SetPanicProc\fR, \fBTcl_FindExecutable\fR or \fBTclZipfs_AppHook\fR.
 .SH "SEE ALSO"
 tclsh(1), Tcl_GetStdChannel(3), Tcl_StandardChannels(3), Tcl_AppInit(3),
 exit(n), encoding(n)
-- 
cgit v0.12


From 4106570aa941dd23622fb8107e28d9702902fbe1 Mon Sep 17 00:00:00 2001
From: "jan.nijtmans" <nijtmans@users.sourceforge.net>
Date: Wed, 28 Apr 2021 15:10:58 +0000
Subject: Fix documentation and remove unused function signature (leftover from
 earlier implementation)

---
 doc/Tcl_Main.3 | 9 +++++++++
 generic/tcl.h  | 2 --
 2 files changed, 9 insertions(+), 2 deletions(-)

diff --git a/doc/Tcl_Main.3 b/doc/Tcl_Main.3
index b7b15a9..986ebbe 100644
--- a/doc/Tcl_Main.3
+++ b/doc/Tcl_Main.3
@@ -206,6 +206,15 @@ The difference between Tcl_MainEx and Tcl_MainExW is that the arguments
 are passed as characters or wide characters. When used in stub-enabled
 embedders, the stubs table must be first initialized using one of
 \fBTcl_InitSubsystems\fR, \fBTcl_SetPanicProc\fR, \fBTcl_FindExecutable\fR or \fBTclZipfs_AppHook\fR.
+.SH "REFERENCE COUNT MANAGEMENT"
+.PP
+\fBTcl_SetStartupScript\fR takes a value (or NULL) for its \fIpath\fR
+argument, and will increment the reference count of it.
+.PP
+\fBTcl_GetStartupScript\fR returns a value with reference count at least 1, or
+NULL. It's \fIencodingPtr\fR is also used (if non-NULL) to return a value with
+a reference count at least 1, or NULL. In both cases, the owner of the values
+is the current thread.
 .SH "SEE ALSO"
 tclsh(1), Tcl_GetStdChannel(3), Tcl_StandardChannels(3), Tcl_AppInit(3),
 exit(n), encoding(n)
diff --git a/generic/tcl.h b/generic/tcl.h
index ec8a8ef..cfc1485 100644
--- a/generic/tcl.h
+++ b/generic/tcl.h
@@ -2148,8 +2148,6 @@ const char *		Tcl_InitStubs(Tcl_Interp *interp, const char *version,
 const char *		TclTomMathInitializeStubs(Tcl_Interp *interp,
 			    const char *version, int epoch, int revision);
 const char *		TclInitStubTable(const char *version);
-void			TclStubMainEx(int index, int argc, const void *argv,
-			    Tcl_AppInitProc *appInitProc, Tcl_Interp *interp);
 void *			TclStubCall(void *arg);
 #if defined(_WIN32)
     TCL_NORETURN1 void Tcl_ConsolePanic(const char *format, ...);
-- 
cgit v0.12