merge trunk

37 files changed, 721 insertions, 446 deletions

diff --git a/ChangeLog b/ChangeLog
index 691db2d..d7ada95 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,28 @@
+2013-07-05  Kevin B. Kenny  <kennykb@acm.org>
+
+	* library/tzdata/Africa/Casablanca:
+	* library/tzdata/America/Asuncion:
+	* library/tzdata/Antarctica/Macquarie:
+	* library/tzdata/Asia/Gaza:
+	* library/tzdata/Asia/Hebron:
+	* library/tzdata/Asia/Jerusalem:
+	http://www.iana.org/time-zones/repository/releases/tzdata2013d.tar.gz
+
+2013-07-03  Jan Nijtmans  <nijtmans@users.sf.net>
+
+	* unix/tclXtNotify.c: Bug [817249]: bring tclXtNotify.c up to date with
+	Tcl_SetNotifier() change.
+
+2013-07-02  Jan Nijtmans  <nijtmans@users.sf.net>
+
+	* unix/tcl.m4:  Bug [32afa6e256]: dirent64 check is incorrect in tcl.m4
+	* unix/configure: (thanks to Brian Griffin)
+
+2013-06-27  Jan Nijtmans  <nijtmans@users.sf.net>
+
+	* generic/tclConfig.c: Bug [9b2e636361]: Tcl_CreateInterp() needs initialized
+	* generic/tclMain.c:   encodings.
+
 2013-06-18  Jan Nijtmans  <nijtmans@users.sf.net>
 
 	* generic/tclEvent.c: Bug [3611974]: InitSubsystems multiple thread issue.
diff --git a/generic/tcl.h b/generic/tcl.h
index d47e931..a833218 100644
--- a/generic/tcl.h
+++ b/generic/tcl.h
@@ -2417,7 +2417,7 @@ const char *		TclTomMathInitializeStubs(Tcl_Interp *interp,
  */
 
 #define Tcl_Main(argc, argv, proc) Tcl_MainEx(argc, argv, proc, \
-	    (Tcl_FindExecutable(argv[0]), (Tcl_CreateInterp)()))
+	    ((Tcl_CreateInterp)()))
 EXTERN void		Tcl_MainEx(int argc, char **argv,
 			    Tcl_AppInitProc *appInitProc, Tcl_Interp *interp);
 EXTERN const char *	Tcl_PkgInitStubsCheck(Tcl_Interp *interp,
diff --git a/generic/tclCompExpr.c b/generic/tclCompExpr.c
index efdc2b0..2a48117 100644
--- a/generic/tclCompExpr.c
+++ b/generic/tclCompExpr.c
@@ -2486,8 +2486,7 @@ CompileExprTree(
 	    break;
 	}
 	case OT_TOKENS:
-	    TclCompileTokens(interp, tokenPtr+1, tokenPtr->numComponents,
-		    envPtr);
+	    CompileTokens(envPtr, tokenPtr, interp);
 	    tokenPtr += tokenPtr->numComponents + 1;
 	    break;
 	default:
diff --git a/generic/tclCompile.c b/generic/tclCompile.c
index aee711c..f2da265 100644
--- a/generic/tclCompile.c
+++ b/generic/tclCompile.c
@@ -1918,8 +1918,7 @@ TclCompileScript(
 		     * The word is not a simple string of characters.
 		     */
 
-		    TclCompileTokens(interp, tokenPtr+1,
-			    tokenPtr->numComponents, envPtr);
+		    CompileTokens(envPtr, tokenPtr, interp);
 		    if (expand && tokenPtr->type == TCL_TOKEN_EXPAND_WORD) {
 			TclEmitInstInt4(INST_EXPAND_STKTOP,
 				envPtr->currStackDepth, envPtr);
@@ -2081,6 +2080,7 @@ TclCompileScript(
 	     * Emit an invoke instruction for the command. We skip this if a
 	     * compile procedure was found for the command.
 	     */
+	    assert(wordIdx > 0);
 
 	    if (expand) {
 		/*
@@ -2102,7 +2102,7 @@ TclCompileScript(
 		TclEmitOpcode(INST_INVOKE_EXPANDED, envPtr);
 		envPtr->expandCount--;
 		TclAdjustStackDepth(1 - wordIdx, envPtr);
-	    } else if (wordIdx > 0) {
+	    } else {
 		/*
 		 * Save PC -> command map for the TclArgumentBC* functions.
 		 */
@@ -2174,8 +2174,6 @@ TclCompileScript(
     if (envPtr->codeNext == entryCodeNext) {
 	PushStringLiteral(envPtr, "");
     }
-
-    envPtr->numSrcBytes = p - script;
 }
 
 /*
@@ -2562,7 +2560,7 @@ TclCompileExprWords(
 
     wordPtr = tokenPtr;
     for (i = 0;  i < numWords;  i++) {
-	TclCompileTokens(interp, wordPtr+1, wordPtr->numComponents, envPtr);
+	CompileTokens(envPtr, wordPtr, interp);
 	if (i < (numWords - 1)) {
 	    PushStringLiteral(envPtr, " ");
 	}
@@ -2614,8 +2612,7 @@ TclCompileNoOp(
 	tokenPtr = tokenPtr + tokenPtr->numComponents + 1;
 
 	if (tokenPtr->type != TCL_TOKEN_SIMPLE_WORD) {
-	    TclCompileTokens(interp, tokenPtr+1, tokenPtr->numComponents,
-		    envPtr);
+	    CompileTokens(envPtr, tokenPtr, interp);
 	    TclEmitOpcode(INST_POP, envPtr);
 	}
     }
diff --git a/generic/tclConfig.c b/generic/tclConfig.c
index a4ba71a..2fb3e92 100644
--- a/generic/tclConfig.c
+++ b/generic/tclConfig.c
@@ -26,14 +26,15 @@
 #define ASSOC_KEY	"tclPackageAboutDict"
 
 /*
- * A ClientData struct for the QueryConfig command.  Store the two bits
+ * A ClientData struct for the QueryConfig command.  Store the three bits
  * of data we need; the package name for which we store a config dict,
- * and the (Tcl_Interp *) in which it is stored.
+ * the (Tcl_Interp *) in which it is stored, and the encoding.
  */
 
 typedef struct QCCD {
     Tcl_Obj *pkg;
     Tcl_Interp *interp;
+    char *encoding;
 } QCCD;
 
 /*
@@ -75,22 +76,28 @@ Tcl_RegisterConfig(
     const char *valEncoding)	/* Name of the encoding used to store the
 				 * configuration values, ASCII, thus UTF-8. */
 {
+    Tcl_Obj *pDB, *pkgDict;
     Tcl_DString cmdName;
     const Tcl_Config *cfg;
-    Tcl_Encoding venc = Tcl_GetEncoding(NULL, valEncoding);
     QCCD *cdPtr = ckalloc(sizeof(QCCD));
 
     cdPtr->interp = interp;
+    if (valEncoding) {
+	cdPtr->encoding = ckalloc(strlen(valEncoding)+1);
+	strcpy(cdPtr->encoding, valEncoding);
+    } else {
+	cdPtr->encoding = NULL;
+    }
     cdPtr->pkg = Tcl_NewStringObj(pkgName, -1);
 
     /*
      * Phase I: Adding the provided information to the internal database of
-     * package meta data. Only if we have an ok encoding.
+     * package meta data.
      *
      * Phase II: Create a command for querying this database, specific to the
-     * package registerting its configuration. This is the approved interface
+     * package registering its configuration. This is the approved interface
      * in TIP 59. In the future a more general interface should be done, as
-     * followup to TIP 59. Simply because our database is now general across
+     * follow-up to TIP 59. Simply because our database is now general across
      * packages, and not a structure tied to one package.
      *
      * Note, the created command will have a reference through its clientdata.
@@ -103,51 +110,35 @@ Tcl_RegisterConfig(
      * dictionaries visible at Tcl level. I.e. they are not filled
      */
 
-    if (venc != NULL) {
-	Tcl_Obj *pkgDict, *pDB = GetConfigDict(interp);
-
-	/*
-	 * Retrieve package specific configuration...
-	 */
-
-	if (Tcl_DictObjGet(interp, pDB, cdPtr->pkg, &pkgDict) != TCL_OK
-		|| (pkgDict == NULL)) {
-	    pkgDict = Tcl_NewDictObj();
-	} else if (Tcl_IsShared(pkgDict)) {
-	    pkgDict = Tcl_DuplicateObj(pkgDict);
-	}
-
-	/*
-	 * Extend the package configuration...
-	 */
-
-	for (cfg=configuration ; cfg->key!=NULL && cfg->key[0]!='\0' ; cfg++) {
-	    Tcl_DString conv;
-	    const char *convValue =
-		    Tcl_ExternalToUtfDString(venc, cfg->value, -1, &conv);
+    pDB = GetConfigDict(interp);
 
-	    /*
-	     * We know that the keys are in ASCII/UTF-8, so for them is no
-	     * conversion required.
-	     */
+    /*
+     * Retrieve package specific configuration...
+     */
 
-	    Tcl_DictObjPut(interp, pkgDict, Tcl_NewStringObj(cfg->key, -1),
-		    Tcl_NewStringObj(convValue, -1));
-	    Tcl_DStringFree(&conv);
-	}
+    if (Tcl_DictObjGet(interp, pDB, cdPtr->pkg, &pkgDict) != TCL_OK
+	    || (pkgDict == NULL)) {
+	pkgDict = Tcl_NewDictObj();
+    } else if (Tcl_IsShared(pkgDict)) {
+	pkgDict = Tcl_DuplicateObj(pkgDict);
+    }
 
-	/*
-	 * We're now done with the encoding, so drop it.
-	 */
+    /*
+     * Extend the package configuration...
+     * We cannot assume that the encodings are initialized, therefore
+     * store the value as-is in a byte array. See Bug [9b2e636361].
+     */
 
-	Tcl_FreeEncoding(venc);
+    for (cfg=configuration ; cfg->key!=NULL && cfg->key[0]!='\0' ; cfg++) {
+	Tcl_DictObjPut(interp, pkgDict, Tcl_NewStringObj(cfg->key, -1),
+		Tcl_NewByteArrayObj((unsigned char *)cfg->value, strlen(cfg->value)));
+    }
 
-	/*
-	 * Write the changes back into the overall database.
-	 */
+    /*
+     * Write the changes back into the overall database.
+     */
 
-	Tcl_DictObjPut(interp, pDB, cdPtr->pkg, pkgDict);
-    }
+    Tcl_DictObjPut(interp, pDB, cdPtr->pkg, pkgDict);
 
     /*
      * Now create the interface command for retrieval of the package
@@ -218,6 +209,9 @@ QueryConfigObjCmd(
     enum subcmds {
 	CFG_GET, CFG_LIST
     };
+    Tcl_DString conv;
+    Tcl_Encoding venc = NULL;
+    const char *value;
 
     if ((objc < 2) || (objc > 3)) {
 	Tcl_WrongNumArgs(interp, 1, objv, "subcommand ?arg?");
@@ -257,7 +251,21 @@ QueryConfigObjCmd(
 	    return TCL_ERROR;
 	}
 
-	Tcl_SetObjResult(interp, val);
+	if (cdPtr->encoding) {
+	    venc = Tcl_GetEncoding(interp, cdPtr->encoding);
+	    if (!venc) {
+		return TCL_ERROR;
+	    }
+	}
+	/*
+	 * Value is stored as-is in a byte array, see Bug [9b2e636361],
+	 * so we have to decode it first.
+	 */
+	value = (const char *) Tcl_GetByteArrayFromObj(val, &n);
+	value = Tcl_ExternalToUtfDString(venc, value, n, &conv);
+	Tcl_SetObjResult(interp, Tcl_NewStringObj(value,
+		Tcl_DStringLength(&conv)));
+	Tcl_DStringFree(&conv);
 	return TCL_OK;
 
     case CFG_LIST:
@@ -324,7 +332,10 @@ QueryConfigDelete(
 
     Tcl_DictObjRemove(NULL, pDB, pkgName);
     Tcl_DecrRefCount(pkgName);
-    ckfree(cdPtr);
+    if (cdPtr->encoding) {
+	ckfree((char *)cdPtr->encoding);
+    }
+    ckfree((char *)cdPtr);
 }
 
 /*
@@ -366,7 +377,7 @@ GetConfigDict(
  *
  *	This function is associated with the "Package About dict" assoc data
  *	for an interpreter; it is invoked when the interpreter is deleted in
- *	order to free the information assoicated with any pending error
+ *	order to free the information associated with any pending error
  *	reports.
  *
  * Results:
diff --git a/generic/tclExecute.c b/generic/tclExecute.c
index 98f1ed8..d3a0d32 100644
--- a/generic/tclExecute.c
+++ b/generic/tclExecute.c
@@ -2766,7 +2766,7 @@ TEBCresume(
 	 */
 
 	auxObjList->length += objc - 1;
-	if ((objc > 1) && (auxObjList-length > 0)) {
+	if ((objc > 1) && (auxObjList->length > 0)) {
 	    length = auxObjList->length /* Total expansion room we need */
 		    + codePtr->maxStackDepth /* Beyond the original max */
 		    - CURR_DEPTH;	/* Relative to where we are */
diff --git a/generic/tclIOSock.c b/generic/tclIOSock.c
index 694501f..7d6c462 100644
--- a/generic/tclIOSock.c
+++ b/generic/tclIOSock.c
@@ -139,7 +139,7 @@ int
 TclCreateSocketAddress(
     Tcl_Interp *interp,                 /* Interpreter for querying
 					 * the desired socket family */
-    struct addrinfo **addrlist,		/* Socket address list */
+    void **addrlist,		/* Socket address list */
     const char *host,			/* Host. NULL implies INADDR_ANY */
     int port,				/* Port number */
     int willBind,			/* Is this an address to bind() to or
@@ -213,7 +213,7 @@ TclCreateSocketAddress(
 	hints.ai_flags |= AI_PASSIVE;
     } 
 
-    result = getaddrinfo(native, portstring, &hints, addrlist);
+    result = getaddrinfo(native, portstring, &hints, (struct addrinfo **) addrlist);
 
     if (host != NULL) {
 	Tcl_DStringFree(&ds);
diff --git a/generic/tclInt.h b/generic/tclInt.h
index 3432b37..b940225 100644
--- a/generic/tclInt.h
+++ b/generic/tclInt.h
@@ -3010,9 +3010,8 @@ MODULE_SCOPE void	TclpFinalizeMutex(Tcl_Mutex *mutexPtr);
 MODULE_SCOPE void	TclpFinalizePipes(void);
 MODULE_SCOPE void	TclpFinalizeSockets(void);
 MODULE_SCOPE int	TclCreateSocketAddress(Tcl_Interp *interp,
-			    struct addrinfo **addrlist,
-			    const char *host, int port, int willBind,
-			    const char **errorMsgPtr);
+			    void **addrlist, const char *host, int port,
+			    int willBind, const char **errorMsgPtr);
 MODULE_SCOPE int	TclpThreadCreate(Tcl_ThreadId *idPtr,
 			    Tcl_ThreadCreateProc *proc, ClientData clientData,
 			    int stackSize, int flags);
@@ -3834,14 +3833,6 @@ MODULE_SCOPE int	TclCompileAssembleCmd(Tcl_Interp *interp,
 			    Tcl_Parse *parsePtr, Command *cmdPtr,
 			    struct CompileEnv *envPtr);
 
-/* Used internally in stub library. */
-typedef struct {
-    char version[12];
-    ClientData data;
-} TclStubInfoType;
-
-MODULE_SCOPE const char *TclInitStubTable(const char *version);
-
 /*
  * Functions defined in generic/tclVar.c and currenttly exported only for use
  * by the bytecode compiler and engine. Some of these could later be placed in
diff --git a/generic/tclIntPlatDecls.h b/generic/tclIntPlatDecls.h
index dcf1753..3181d4e 100644
--- a/generic/tclIntPlatDecls.h
+++ b/generic/tclIntPlatDecls.h
@@ -545,6 +545,8 @@ extern const TclIntPlatStubs *tclIntPlatStubsPtr;
 #undef TclpGmtime_unix
 #undef TclWinConvertWSAError
 #define TclWinConvertWSAError TclWinConvertError
+#undef TclpInetNtoa
+#define TclpInetNtoa inet_ntoa
 
 #if defined(__WIN32__) || defined(__CYGWIN__)
 #   undef TclWinNToHS
diff --git a/generic/tclMain.c b/generic/tclMain.c
index f445383..faea75a 100644
--- a/generic/tclMain.c
+++ b/generic/tclMain.c
@@ -313,6 +313,9 @@ Tcl_MainEx(
     Tcl_Channel chan;
     InteractiveState is;
 
+    TclpSetInitialEncodings();
+    TclpFindExecutable((const char *)argv[0]);
+
     Tcl_InitMemory(interp);
 
     is.interp = interp;
@@ -640,7 +643,6 @@ Tcl_Main(
 				 * function to call after most initialization
 				 * but before starting to execute commands. */
 {
-    Tcl_FindExecutable(argv[0]);
     Tcl_MainEx(argc, argv, appInitProc, Tcl_CreateInterp());
 }
 #endif /* TCL_MAJOR_VERSION == 8 && !UNICODE */
diff --git a/generic/tclOptimize.c b/generic/tclOptimize.c
index cd37a6a..b7f4173 100644
--- a/generic/tclOptimize.c
+++ b/generic/tclOptimize.c
@@ -212,7 +212,8 @@ ConvertZeroEffectToNOP(
 	int blank = 0, i, nextInst;
 
 	size = AddrLength(currentInstPtr);
-	while (*(currentInstPtr+size) == INST_NOP) {
+	while ((currentInstPtr + size < envPtr->codeNext)
+		&& *(currentInstPtr+size) == INST_NOP) {
 	    if (IsTargetAddress(&targets, currentInstPtr + size)) {
 		break;
 	    }
diff --git a/generic/tclPanic.c b/generic/tclPanic.c
index b87a8df..2a453b9 100644
--- a/generic/tclPanic.c
+++ b/generic/tclPanic.c
@@ -52,6 +52,10 @@ Tcl_SetPanicProc(
 #if defined(_WIN32)
     /* tclWinDebugPanic only installs if there is no panicProc yet. */
     if ((proc != tclWinDebugPanic) || (panicProc == NULL))
+#elif defined(__CYGWIN__)
+    if (proc == NULL)
+	panicProc = tclWinDebugPanic;
+    else
 #endif
     panicProc = proc;
 }
diff --git a/generic/tclResult.c b/generic/tclResult.c
index 014ea1b..2f2563a 100644
--- a/generic/tclResult.c
+++ b/generic/tclResult.c
@@ -1112,6 +1112,7 @@ Tcl_SetObjErrorCode(
  *----------------------------------------------------------------------
  */
 
+#undef Tcl_GetErrorLine
 int
 Tcl_GetErrorLine(
     Tcl_Interp *interp)
@@ -1129,6 +1130,7 @@ Tcl_GetErrorLine(
  *----------------------------------------------------------------------
  */
 
+#undef Tcl_SetErrorLine
 void
 Tcl_SetErrorLine(
     Tcl_Interp *interp,
diff --git a/generic/tclStubInit.c b/generic/tclStubInit.c
index 1b04542..782bbdf 100644
--- a/generic/tclStubInit.c
+++ b/generic/tclStubInit.c
@@ -43,6 +43,7 @@
 #undef TclSockMinimumBuffers
 #define TclBackgroundException Tcl_BackgroundException
 #undef Tcl_SetIntObj
+#undef TclpInetNtoa
 
 /* See bug 510001: TclSockMinimumBuffers needs plat imp */
 #ifdef _WIN64
diff --git a/generic/tclStubLib.c b/generic/tclStubLib.c
index e617515..859cbf9 100644
--- a/generic/tclStubLib.c
+++ b/generic/tclStubLib.c
@@ -13,6 +13,16 @@
 
 #include "tclInt.h"
 
+MODULE_SCOPE const TclStubs *tclStubsPtr;
+MODULE_SCOPE const TclPlatStubs *tclPlatStubsPtr;
+MODULE_SCOPE const TclIntStubs *tclIntStubsPtr;
+MODULE_SCOPE const TclIntPlatStubs *tclIntPlatStubsPtr;
+
+const TclStubs *tclStubsPtr = NULL;
+const TclPlatStubs *tclPlatStubsPtr = NULL;
+const TclIntStubs *tclIntStubsPtr = NULL;
+const TclIntPlatStubs *tclIntPlatStubsPtr = NULL;
+
 /*
  * Use our own isDigit to avoid linking to libc on windows
  */
@@ -48,7 +58,7 @@ Tcl_InitStubs(
 {
     Interp *iPtr = (Interp *) interp;
     const char *actualVersion = NULL;
-    TclStubInfoType stub;
+    ClientData pkgData = NULL;
     const TclStubs *stubsPtr = iPtr->stubTable;
 
     /*
@@ -63,7 +73,7 @@ Tcl_InitStubs(
 	return NULL;
     }
 
-    actualVersion = stubsPtr->tcl_PkgRequireEx(interp, "Tcl", version, 0, &stub.data);
+    actualVersion = stubsPtr->tcl_PkgRequireEx(interp, "Tcl", version, 0, &pkgData);
     if (actualVersion == NULL) {
 	return NULL;
     }
@@ -93,7 +103,18 @@ Tcl_InitStubs(
 	    }
 	}
     }
-    TclInitStubTable(stub.version);
+    tclStubsPtr = (TclStubs *)pkgData;
+
+    if (tclStubsPtr->hooks) {
+	tclPlatStubsPtr = tclStubsPtr->hooks->tclPlatStubs;
+	tclIntStubsPtr = tclStubsPtr->hooks->tclIntStubs;
+	tclIntPlatStubsPtr = tclStubsPtr->hooks->tclIntPlatStubs;
+    } else {
+	tclPlatStubsPtr = NULL;
+	tclIntStubsPtr = NULL;
+	tclIntPlatStubsPtr = NULL;
+    }
+
     return actualVersion;
 }
 
diff --git a/generic/tclStubLibTbl.c b/generic/tclStubLibTbl.c
deleted file mode 100644
index 0ed057f..0000000
--- a/generic/tclStubLibTbl.c
+++ /dev/null
@@ -1,69 +0,0 @@
-/*
- * tclStubLibTbl.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"
-
-MODULE_SCOPE const TclStubs *tclStubsPtr;
-MODULE_SCOPE const TclPlatStubs *tclPlatStubsPtr;
-MODULE_SCOPE const TclIntStubs *tclIntStubsPtr;
-MODULE_SCOPE const TclIntPlatStubs *tclIntPlatStubsPtr;
-
-const TclStubs *tclStubsPtr = NULL;
-const TclPlatStubs *tclPlatStubsPtr = NULL;
-const TclIntStubs *tclIntStubsPtr = NULL;
-const TclIntPlatStubs *tclIntPlatStubsPtr = NULL;
-
-
-/*
- *----------------------------------------------------------------------
- *
- * TclInitStubTable --
- *
- *	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.
- *
- *----------------------------------------------------------------------
- */
-MODULE_SCOPE const char *
-TclInitStubTable(
-	const char *version) /* points to the version field of a
-	                        TclStubInfoType structure variable. */
-{
-    const TclStubInfoType *ptr = (const TclStubInfoType *) version;
-    tclStubsPtr = (const TclStubs *) ptr->data;
-
-    if (tclStubsPtr->hooks) {
-	tclPlatStubsPtr = tclStubsPtr->hooks->tclPlatStubs;
-	tclIntStubsPtr = tclStubsPtr->hooks->tclIntStubs;
-	tclIntPlatStubsPtr = tclStubsPtr->hooks->tclIntPlatStubs;
-    } else {
-	tclPlatStubsPtr = NULL;
-	tclIntStubsPtr = NULL;
-	tclIntPlatStubsPtr = NULL;
-    }
-    return version;
-}
-
-/*
- * Local Variables:
- * mode: c
- * c-basic-offset: 4
- * fill-column: 78
- * End:
- */
diff --git a/generic/tclTest.c b/generic/tclTest.c
index 835036b..27ee89c 100644
--- a/generic/tclTest.c
+++ b/generic/tclTest.c
@@ -1856,7 +1856,7 @@ TestdstringCmd(
 	if (Tcl_GetInt(interp, argv[2], &count) != TCL_OK) {
 	    return TCL_ERROR;
 	}
-	Tcl_DStringTrunc(&dstring, count);
+	Tcl_DStringSetLength(&dstring, count);
     } else if (strcmp(argv[1], "start") == 0) {
 	if (argc != 2) {
 	    goto wrongNumArgs;
diff --git a/library/clock.tcl b/library/clock.tcl
index 0696c47..166c377 100644
--- a/library/clock.tcl
+++ b/library/clock.tcl
@@ -3861,7 +3861,7 @@ proc ::tcl::clock::ProcessPosixTimeZone { z } {
 
     # Put DST in effect in all years from 1916 to 2099.
 
-    for { set y 1916 } { $y < 2099 } { incr y } {
+    for { set y 1916 } { $y < 2100 } { incr y } {
 	set startTime [DeterminePosixDSTTime $z start $y]
 	incr startTime [expr { - wide($stdOffset) }]
 	set endTime [DeterminePosixDSTTime $z end $y]
diff --git a/library/tzdata/Africa/Casablanca b/library/tzdata/Africa/Casablanca
index 74b767a..757007c 100644
--- a/library/tzdata/Africa/Casablanca
+++ b/library/tzdata/Africa/Casablanca
@@ -34,8 +34,8 @@ set TZData(:Africa/Casablanca) {
     {1345428000 3600 1 WEST}
     {1348970400 0 0 WET}
     {1367114400 3600 1 WEST}
-    {1373335200 0 0 WET}
-    {1375927200 3600 1 WEST}
+    {1373162400 0 0 WET}
+    {1376100000 3600 1 WEST}
     {1380420000 0 0 WET}
     {1398564000 3600 1 WEST}
     {1404007200 0 0 WET}
diff --git a/library/tzdata/America/Asuncion b/library/tzdata/America/Asuncion
index d530193..9ea30da 100644
--- a/library/tzdata/America/Asuncion
+++ b/library/tzdata/America/Asuncion
@@ -83,178 +83,177 @@ set TZData(:America/Asuncion) {
     {1333854000 -14400 0 PYT}
     {1349582400 -10800 1 PYST}
     {1364094000 -14400 0 PYT}
-    {1365912000 -14400 0 PYT}
     {1381032000 -10800 1 PYST}
-    {1397358000 -14400 0 PYT}
+    {1395543600 -14400 0 PYT}
     {1412481600 -10800 1 PYST}
-    {1428807600 -14400 0 PYT}
+    {1426993200 -14400 0 PYT}
     {1443931200 -10800 1 PYST}
-    {1460257200 -14400 0 PYT}
+    {1459047600 -14400 0 PYT}
     {1475380800 -10800 1 PYST}
-    {1491706800 -14400 0 PYT}
+    {1490497200 -14400 0 PYT}
     {1506830400 -10800 1 PYST}
-    {1523156400 -14400 0 PYT}
+    {1521946800 -14400 0 PYT}
     {1538884800 -10800 1 PYST}
-    {1555210800 -14400 0 PYT}
+    {1553396400 -14400 0 PYT}
     {1570334400 -10800 1 PYST}
-    {1586660400 -14400 0 PYT}
+    {1584846000 -14400 0 PYT}
     {1601784000 -10800 1 PYST}
-    {1618110000 -14400 0 PYT}
+    {1616900400 -14400 0 PYT}
     {1633233600 -10800 1 PYST}
-    {1649559600 -14400 0 PYT}
+    {1648350000 -14400 0 PYT}
     {1664683200 -10800 1 PYST}
-    {1681009200 -14400 0 PYT}
+    {1679799600 -14400 0 PYT}
     {1696132800 -10800 1 PYST}
-    {1713063600 -14400 0 PYT}
+    {1711249200 -14400 0 PYT}
     {1728187200 -10800 1 PYST}
-    {1744513200 -14400 0 PYT}
+    {1742698800 -14400 0 PYT}
     {1759636800 -10800 1 PYST}
-    {1775962800 -14400 0 PYT}
+    {1774148400 -14400 0 PYT}
     {1791086400 -10800 1 PYST}
-    {1807412400 -14400 0 PYT}
+    {1806202800 -14400 0 PYT}
     {1822536000 -10800 1 PYST}
-    {1838862000 -14400 0 PYT}
+    {1837652400 -14400 0 PYT}
     {1853985600 -10800 1 PYST}
-    {1870311600 -14400 0 PYT}
+    {1869102000 -14400 0 PYT}
     {1886040000 -10800 1 PYST}
-    {1902366000 -14400 0 PYT}
+    {1900551600 -14400 0 PYT}
     {1917489600 -10800 1 PYST}
-    {1933815600 -14400 0 PYT}
+    {1932001200 -14400 0 PYT}
     {1948939200 -10800 1 PYST}
-    {1965265200 -14400 0 PYT}
+    {1964055600 -14400 0 PYT}
     {1980388800 -10800 1 PYST}
-    {1996714800 -14400 0 PYT}
+    {1995505200 -14400 0 PYT}
     {2011838400 -10800 1 PYST}
-    {2028164400 -14400 0 PYT}
+    {2026954800 -14400 0 PYT}
     {2043288000 -10800 1 PYST}
-    {2059614000 -14400 0 PYT}
+    {2058404400 -14400 0 PYT}
     {2075342400 -10800 1 PYST}
-    {2091668400 -14400 0 PYT}
+    {2089854000 -14400 0 PYT}
     {2106792000 -10800 1 PYST}
-    {2123118000 -14400 0 PYT}
+    {2121303600 -14400 0 PYT}
     {2138241600 -10800 1 PYST}
-    {2154567600 -14400 0 PYT}
+    {2153358000 -14400 0 PYT}
     {2169691200 -10800 1 PYST}
-    {2186017200 -14400 0 PYT}
+    {2184807600 -14400 0 PYT}
     {2201140800 -10800 1 PYST}
-    {2217466800 -14400 0 PYT}
+    {2216257200 -14400 0 PYT}
     {2233195200 -10800 1 PYST}
-    {2249521200 -14400 0 PYT}
+    {2247706800 -14400 0 PYT}
     {2264644800 -10800 1 PYST}
-    {2280970800 -14400 0 PYT}
+    {2279156400 -14400 0 PYT}
     {2296094400 -10800 1 PYST}
-    {2312420400 -14400 0 PYT}
+    {2310606000 -14400 0 PYT}
     {2327544000 -10800 1 PYST}
-    {2343870000 -14400 0 PYT}
+    {2342660400 -14400 0 PYT}
     {2358993600 -10800 1 PYST}
-    {2375319600 -14400 0 PYT}
+    {2374110000 -14400 0 PYT}
     {2390443200 -10800 1 PYST}
-    {2406769200 -14400 0 PYT}
+    {2405559600 -14400 0 PYT}
     {2422497600 -10800 1 PYST}
-    {2438823600 -14400 0 PYT}
+    {2437009200 -14400 0 PYT}
     {2453947200 -10800 1 PYST}
-    {2470273200 -14400 0 PYT}
+    {2468458800 -14400 0 PYT}
     {2485396800 -10800 1 PYST}
-    {2501722800 -14400 0 PYT}
+    {2500513200 -14400 0 PYT}
     {2516846400 -10800 1 PYST}
-    {2533172400 -14400 0 PYT}
+    {2531962800 -14400 0 PYT}
     {2548296000 -10800 1 PYST}
-    {2564622000 -14400 0 PYT}
+    {2563412400 -14400 0 PYT}
     {2579745600 -10800 1 PYST}
-    {2596676400 -14400 0 PYT}
+    {2594862000 -14400 0 PYT}
     {2611800000 -10800 1 PYST}
-    {2628126000 -14400 0 PYT}
+    {2626311600 -14400 0 PYT}
     {2643249600 -10800 1 PYST}
-    {2659575600 -14400 0 PYT}
+    {2657761200 -14400 0 PYT}
     {2674699200 -10800 1 PYST}
-    {2691025200 -14400 0 PYT}
+    {2689815600 -14400 0 PYT}
     {2706148800 -10800 1 PYST}
-    {2722474800 -14400 0 PYT}
+    {2721265200 -14400 0 PYT}
     {2737598400 -10800 1 PYST}
-    {2753924400 -14400 0 PYT}
+    {2752714800 -14400 0 PYT}
     {2769652800 -10800 1 PYST}
-    {2785978800 -14400 0 PYT}
+    {2784164400 -14400 0 PYT}
     {2801102400 -10800 1 PYST}
-    {2817428400 -14400 0 PYT}
+    {2815614000 -14400 0 PYT}
     {2832552000 -10800 1 PYST}
-    {2848878000 -14400 0 PYT}
+    {2847668400 -14400 0 PYT}
     {2864001600 -10800 1 PYST}
-    {2880327600 -14400 0 PYT}
+    {2879118000 -14400 0 PYT}
     {2895451200 -10800 1 PYST}
-    {2911777200 -14400 0 PYT}
+    {2910567600 -14400 0 PYT}
     {2926900800 -10800 1 PYST}
-    {2943226800 -14400 0 PYT}
+    {2942017200 -14400 0 PYT}
     {2958955200 -10800 1 PYST}
-    {2975281200 -14400 0 PYT}
+    {2973466800 -14400 0 PYT}
     {2990404800 -10800 1 PYST}
-    {3006730800 -14400 0 PYT}
+    {3004916400 -14400 0 PYT}
     {3021854400 -10800 1 PYST}
-    {3038180400 -14400 0 PYT}
+    {3036970800 -14400 0 PYT}
     {3053304000 -10800 1 PYST}
-    {3069630000 -14400 0 PYT}
+    {3068420400 -14400 0 PYT}
     {3084753600 -10800 1 PYST}
-    {3101079600 -14400 0 PYT}
+    {3099870000 -14400 0 PYT}
     {3116808000 -10800 1 PYST}
-    {3133134000 -14400 0 PYT}
+    {3131319600 -14400 0 PYT}
     {3148257600 -10800 1 PYST}
-    {3164583600 -14400 0 PYT}
+    {3162769200 -14400 0 PYT}
     {3179707200 -10800 1 PYST}
-    {3196033200 -14400 0 PYT}
+    {3194218800 -14400 0 PYT}
     {3211156800 -10800 1 PYST}
-    {3227482800 -14400 0 PYT}
+    {3226273200 -14400 0 PYT}
     {3242606400 -10800 1 PYST}
-    {3258932400 -14400 0 PYT}
+    {3257722800 -14400 0 PYT}
     {3274056000 -10800 1 PYST}
-    {3290382000 -14400 0 PYT}
+    {3289172400 -14400 0 PYT}
     {3306110400 -10800 1 PYST}
-    {3322436400 -14400 0 PYT}
+    {3320622000 -14400 0 PYT}
     {3337560000 -10800 1 PYST}
-    {3353886000 -14400 0 PYT}
+    {3352071600 -14400 0 PYT}
     {3369009600 -10800 1 PYST}
-    {3385335600 -14400 0 PYT}
+    {3384126000 -14400 0 PYT}
     {3400459200 -10800 1 PYST}
-    {3416785200 -14400 0 PYT}
+    {3415575600 -14400 0 PYT}
     {3431908800 -10800 1 PYST}
-    {3448234800 -14400 0 PYT}
+    {3447025200 -14400 0 PYT}
     {3463358400 -10800 1 PYST}
-    {3480289200 -14400 0 PYT}
+    {3478474800 -14400 0 PYT}
     {3495412800 -10800 1 PYST}
-    {3511738800 -14400 0 PYT}
+    {3509924400 -14400 0 PYT}
     {3526862400 -10800 1 PYST}
-    {3543188400 -14400 0 PYT}
+    {3541374000 -14400 0 PYT}
     {3558312000 -10800 1 PYST}
-    {3574638000 -14400 0 PYT}
+    {3573428400 -14400 0 PYT}
     {3589761600 -10800 1 PYST}
-    {3606087600 -14400 0 PYT}
+    {3604878000 -14400 0 PYT}
     {3621211200 -10800 1 PYST}
-    {3637537200 -14400 0 PYT}
+    {3636327600 -14400 0 PYT}
     {3653265600 -10800 1 PYST}
-    {3669591600 -14400 0 PYT}
+    {3667777200 -14400 0 PYT}
     {3684715200 -10800 1 PYST}
-    {3701041200 -14400 0 PYT}
+    {3699226800 -14400 0 PYT}
     {3716164800 -10800 1 PYST}
-    {3732490800 -14400 0 PYT}
+    {3731281200 -14400 0 PYT}
     {3747614400 -10800 1 PYST}
-    {3763940400 -14400 0 PYT}
+    {3762730800 -14400 0 PYT}
     {3779064000 -10800 1 PYST}
-    {3795390000 -14400 0 PYT}
+    {3794180400 -14400 0 PYT}
     {3810513600 -10800 1 PYST}
-    {3826839600 -14400 0 PYT}
+    {3825630000 -14400 0 PYT}
     {3842568000 -10800 1 PYST}
-    {3858894000 -14400 0 PYT}
+    {3857079600 -14400 0 PYT}
     {3874017600 -10800 1 PYST}
-    {3890343600 -14400 0 PYT}
+    {3888529200 -14400 0 PYT}
     {3905467200 -10800 1 PYST}
-    {3921793200 -14400 0 PYT}
+    {3920583600 -14400 0 PYT}
     {3936916800 -10800 1 PYST}
-    {3953242800 -14400 0 PYT}
+    {3952033200 -14400 0 PYT}
     {3968366400 -10800 1 PYST}
-    {3984692400 -14400 0 PYT}
+    {3983482800 -14400 0 PYT}
     {4000420800 -10800 1 PYST}
-    {4016746800 -14400 0 PYT}
+    {4014932400 -14400 0 PYT}
     {4031870400 -10800 1 PYST}
-    {4048196400 -14400 0 PYT}
+    {4046382000 -14400 0 PYT}
     {4063320000 -10800 1 PYST}
-    {4079646000 -14400 0 PYT}
+    {4077831600 -14400 0 PYT}
     {4094769600 -10800 1 PYST}
 }
diff --git a/library/tzdata/Antarctica/Macquarie b/library/tzdata/Antarctica/Macquarie
index 9877ee8..bd5cf8a 100644
--- a/library/tzdata/Antarctica/Macquarie
+++ b/library/tzdata/Antarctica/Macquarie
@@ -2,16 +2,11 @@
 
 set TZData(:Antarctica/Macquarie) {
     {-9223372036854775808 0 0 zzz}
-    {-1861920000 36000 0 EST}
+    {-2214259200 36000 0 EST}
     {-1680508800 39600 1 EST}
     {-1669892400 39600 0 EST}
     {-1665392400 36000 0 EST}
-    {-883641600 39600 1 EST}
-    {-876128400 36000 0 EST}
-    {-860400000 39600 1 EST}
-    {-844678800 36000 0 EST}
-    {-828345600 39600 1 EST}
-    {-813229200 36000 0 EST}
+    {-1601719200 0 0 zzz}
     {-94730400 36000 0 EST}
     {-71136000 39600 1 EST}
     {-55411200 36000 0 EST}
diff --git a/library/tzdata/Asia/Gaza b/library/tzdata/Asia/Gaza
index 43e1847..a0636e2 100644
--- a/library/tzdata/Asia/Gaza
+++ b/library/tzdata/Asia/Gaza
@@ -88,14 +88,191 @@ set TZData(:Asia/Gaza) {
     {1158872400 7200 0 EET}
     {1175378400 10800 1 EEST}
     {1189638000 7200 0 EET}
-    {1207000800 10800 1 EEST}
-    {1219957200 7200 0 EET}
+    {1206655200 10800 1 EEST}
+    {1219960800 7200 0 EET}
+    {1220220000 7200 0 EET}
     {1238104800 10800 1 EEST}
-    {1252018800 7200 0 EET}
-    {1269640860 10800 1 EEST}
+    {1252015200 7200 0 EET}
+    {1262296800 7200 0 EET}
+    {1269640860 10800 0 EEST}
     {1281474000 7200 0 EET}
-    {1301738460 10800 1 EEST}
-    {1312146000 7200 0 EET}
+    {1301608860 10800 1 EEST}
+    {1312149600 7200 0 EET}
+    {1325368800 7200 0 EET}
     {1333058400 10800 1 EEST}
     {1348178400 7200 0 EET}
+    {1364508000 10800 1 EEST}
+    {1380232800 7200 0 EET}
+    {1395957600 10800 1 EEST}
+    {1411682400 7200 0 EET}
+    {1427407200 10800 1 EEST}
+    {1443132000 7200 0 EET}
+    {1459461600 10800 1 EEST}
+    {1474581600 7200 0 EET}
+    {1490911200 10800 1 EEST}
+    {1506031200 7200 0 EET}
+    {1522360800 10800 1 EEST}
+    {1537480800 7200 0 EET}
+    {1553810400 10800 1 EEST}
+    {1569535200 7200 0 EET}
+    {1585260000 10800 1 EEST}
+    {1600984800 7200 0 EET}
+    {1616709600 10800 1 EEST}
+    {1632434400 7200 0 EET}
+    {1648764000 10800 1 EEST}
+    {1663884000 7200 0 EET}
+    {1680213600 10800 1 EEST}
+    {1695333600 7200 0 EET}
+    {1711663200 10800 1 EEST}
+    {1727388000 7200 0 EET}
+    {1743112800 10800 1 EEST}
+    {1758837600 7200 0 EET}
+    {1774562400 10800 1 EEST}
+    {1790287200 7200 0 EET}
+    {1806012000 10800 1 EEST}
+    {1821736800 7200 0 EET}
+    {1838066400 10800 1 EEST}
+    {1853186400 7200 0 EET}
+    {1869516000 10800 1 EEST}
+    {1884636000 7200 0 EET}
+    {1900965600 10800 1 EEST}
+    {1916690400 7200 0 EET}
+    {1932415200 10800 1 EEST}
+    {1948140000 7200 0 EET}
+    {1963864800 10800 1 EEST}
+    {1979589600 7200 0 EET}
+    {1995919200 10800 1 EEST}
+    {2011039200 7200 0 EET}
+    {2027368800 10800 1 EEST}
+    {2042488800 7200 0 EET}
+    {2058818400 10800 1 EEST}
+    {2073938400 7200 0 EET}
+    {2090268000 10800 1 EEST}
+    {2105992800 7200 0 EET}
+    {2121717600 10800 1 EEST}
+    {2137442400 7200 0 EET}
+    {2153167200 10800 1 EEST}
+    {2168892000 7200 0 EET}
+    {2185221600 10800 1 EEST}
+    {2200341600 7200 0 EET}
+    {2216671200 10800 1 EEST}
+    {2231791200 7200 0 EET}
+    {2248120800 10800 1 EEST}
+    {2263845600 7200 0 EET}
+    {2279570400 10800 1 EEST}
+    {2295295200 7200 0 EET}
+    {2311020000 10800 1 EEST}
+    {2326744800 7200 0 EET}
+    {2343074400 10800 1 EEST}
+    {2358194400 7200 0 EET}
+    {2374524000 10800 1 EEST}
+    {2389644000 7200 0 EET}
+    {2405973600 10800 1 EEST}
+    {2421093600 7200 0 EET}
+    {2437423200 10800 1 EEST}
+    {2453148000 7200 0 EET}
+    {2468872800 10800 1 EEST}
+    {2484597600 7200 0 EET}
+    {2500322400 10800 1 EEST}
+    {2516047200 7200 0 EET}
+    {2532376800 10800 1 EEST}
+    {2547496800 7200 0 EET}
+    {2563826400 10800 1 EEST}
+    {2578946400 7200 0 EET}
+    {2595276000 10800 1 EEST}
+    {2611000800 7200 0 EET}
+    {2626725600 10800 1 EEST}
+    {2642450400 7200 0 EET}
+    {2658175200 10800 1 EEST}
+    {2673900000 7200 0 EET}
+    {2689624800 10800 1 EEST}
+    {2705349600 7200 0 EET}
+    {2721679200 10800 1 EEST}
+    {2736799200 7200 0 EET}
+    {2753128800 10800 1 EEST}
+    {2768248800 7200 0 EET}
+    {2784578400 10800 1 EEST}
+    {2800303200 7200 0 EET}
+    {2816028000 10800 1 EEST}
+    {2831752800 7200 0 EET}
+    {2847477600 10800 1 EEST}
+    {2863202400 7200 0 EET}
+    {2879532000 10800 1 EEST}
+    {2894652000 7200 0 EET}
+    {2910981600 10800 1 EEST}
+    {2926101600 7200 0 EET}
+    {2942431200 10800 1 EEST}
+    {2957551200 7200 0 EET}
+    {2973880800 10800 1 EEST}
+    {2989605600 7200 0 EET}
+    {3005330400 10800 1 EEST}
+    {3021055200 7200 0 EET}
+    {3036780000 10800 1 EEST}
+    {3052504800 7200 0 EET}
+    {3068834400 10800 1 EEST}
+    {3083954400 7200 0 EET}
+    {3100284000 10800 1 EEST}
+    {3115404000 7200 0 EET}
+    {3131733600 10800 1 EEST}
+    {3147458400 7200 0 EET}
+    {3163183200 10800 1 EEST}
+    {3178908000 7200 0 EET}
+    {3194632800 10800 1 EEST}
+    {3210357600 7200 0 EET}
+    {3226687200 10800 1 EEST}
+    {3241807200 7200 0 EET}
+    {3258136800 10800 1 EEST}
+    {3273256800 7200 0 EET}
+    {3289586400 10800 1 EEST}
+    {3304706400 7200 0 EET}
+    {3321036000 10800 1 EEST}
+    {3336760800 7200 0 EET}
+    {3352485600 10800 1 EEST}
+    {3368210400 7200 0 EET}
+    {3383935200 10800 1 EEST}
+    {3399660000 7200 0 EET}
+    {3415989600 10800 1 EEST}
+    {3431109600 7200 0 EET}
+    {3447439200 10800 1 EEST}
+    {3462559200 7200 0 EET}
+    {3478888800 10800 1 EEST}
+    {3494613600 7200 0 EET}
+    {3510338400 10800 1 EEST}
+    {3526063200 7200 0 EET}
+    {3541788000 10800 1 EEST}
+    {3557512800 7200 0 EET}
+    {3573237600 10800 1 EEST}
+    {3588962400 7200 0 EET}
+    {3605292000 10800 1 EEST}
+    {3620412000 7200 0 EET}
+    {3636741600 10800 1 EEST}
+    {3651861600 7200 0 EET}
+    {3668191200 10800 1 EEST}
+    {3683916000 7200 0 EET}
+    {3699640800 10800 1 EEST}
+    {3715365600 7200 0 EET}
+    {3731090400 10800 1 EEST}
+    {3746815200 7200 0 EET}
+    {3763144800 10800 1 EEST}
+    {3778264800 7200 0 EET}
+    {3794594400 10800 1 EEST}
+    {3809714400 7200 0 EET}
+    {3826044000 10800 1 EEST}
+    {3841164000 7200 0 EET}
+    {3857493600 10800 1 EEST}
+    {3873218400 7200 0 EET}
+    {3888943200 10800 1 EEST}
+    {3904668000 7200 0 EET}
+    {3920392800 10800 1 EEST}
+    {3936117600 7200 0 EET}
+    {3952447200 10800 1 EEST}
+    {3967567200 7200 0 EET}
+    {3983896800 10800 1 EEST}
+    {3999016800 7200 0 EET}
+    {4015346400 10800 1 EEST}
+    {4031071200 7200 0 EET}
+    {4046796000 10800 1 EEST}
+    {4062520800 7200 0 EET}
+    {4078245600 10800 1 EEST}
+    {4093970400 7200 0 EET}
 }
diff --git a/library/tzdata/Asia/Hebron b/library/tzdata/Asia/Hebron
index 98bb353..a8a9019 100644
--- a/library/tzdata/Asia/Hebron
+++ b/library/tzdata/Asia/Hebron
@@ -88,17 +88,190 @@ set TZData(:Asia/Hebron) {
     {1158872400 7200 0 EET}
     {1175378400 10800 1 EEST}
     {1189638000 7200 0 EET}
-    {1207000800 10800 1 EEST}
-    {1217541600 10800 1 EEST}
+    {1206655200 10800 1 EEST}
     {1220216400 7200 0 EET}
     {1238104800 10800 1 EEST}
-    {1252018800 7200 0 EET}
-    {1269640860 10800 1 EEST}
+    {1252015200 7200 0 EET}
+    {1269554400 10800 1 EEST}
     {1281474000 7200 0 EET}
-    {1301652060 10800 1 EEST}
+    {1301608860 10800 1 EEST}
     {1312146000 7200 0 EET}
     {1314655200 10800 1 EEST}
-    {1317340800 7200 0 EET}
+    {1317330000 7200 0 EET}
     {1333058400 10800 1 EEST}
     {1348178400 7200 0 EET}
+    {1364508000 10800 1 EEST}
+    {1380232800 7200 0 EET}
+    {1395957600 10800 1 EEST}
+    {1411682400 7200 0 EET}
+    {1427407200 10800 1 EEST}
+    {1443132000 7200 0 EET}
+    {1459461600 10800 1 EEST}
+    {1474581600 7200 0 EET}
+    {1490911200 10800 1 EEST}
+    {1506031200 7200 0 EET}
+    {1522360800 10800 1 EEST}
+    {1537480800 7200 0 EET}
+    {1553810400 10800 1 EEST}
+    {1569535200 7200 0 EET}
+    {1585260000 10800 1 EEST}
+    {1600984800 7200 0 EET}
+    {1616709600 10800 1 EEST}
+    {1632434400 7200 0 EET}
+    {1648764000 10800 1 EEST}
+    {1663884000 7200 0 EET}
+    {1680213600 10800 1 EEST}
+    {1695333600 7200 0 EET}
+    {1711663200 10800 1 EEST}
+    {1727388000 7200 0 EET}
+    {1743112800 10800 1 EEST}
+    {1758837600 7200 0 EET}
+    {1774562400 10800 1 EEST}
+    {1790287200 7200 0 EET}
+    {1806012000 10800 1 EEST}
+    {1821736800 7200 0 EET}
+    {1838066400 10800 1 EEST}
+    {1853186400 7200 0 EET}
+    {1869516000 10800 1 EEST}
+    {1884636000 7200 0 EET}
+    {1900965600 10800 1 EEST}
+    {1916690400 7200 0 EET}
+    {1932415200 10800 1 EEST}
+    {1948140000 7200 0 EET}
+    {1963864800 10800 1 EEST}
+    {1979589600 7200 0 EET}
+    {1995919200 10800 1 EEST}
+    {2011039200 7200 0 EET}
+    {2027368800 10800 1 EEST}
+    {2042488800 7200 0 EET}
+    {2058818400 10800 1 EEST}
+    {2073938400 7200 0 EET}
+    {2090268000 10800 1 EEST}
+    {2105992800 7200 0 EET}
+    {2121717600 10800 1 EEST}
+    {2137442400 7200 0 EET}
+    {2153167200 10800 1 EEST}
+    {2168892000 7200 0 EET}
+    {2185221600 10800 1 EEST}
+    {2200341600 7200 0 EET}
+    {2216671200 10800 1 EEST}
+    {2231791200 7200 0 EET}
+    {2248120800 10800 1 EEST}
+    {2263845600 7200 0 EET}
+    {2279570400 10800 1 EEST}
+    {2295295200 7200 0 EET}
+    {2311020000 10800 1 EEST}
+    {2326744800 7200 0 EET}
+    {2343074400 10800 1 EEST}
+    {2358194400 7200 0 EET}
+    {2374524000 10800 1 EEST}
+    {2389644000 7200 0 EET}
+    {2405973600 10800 1 EEST}
+    {2421093600 7200 0 EET}
+    {2437423200 10800 1 EEST}
+    {2453148000 7200 0 EET}
+    {2468872800 10800 1 EEST}
+    {2484597600 7200 0 EET}
+    {2500322400 10800 1 EEST}
+    {2516047200 7200 0 EET}
+    {2532376800 10800 1 EEST}
+    {2547496800 7200 0 EET}
+    {2563826400 10800 1 EEST}
+    {2578946400 7200 0 EET}
+    {2595276000 10800 1 EEST}
+    {2611000800 7200 0 EET}
+    {2626725600 10800 1 EEST}
+    {2642450400 7200 0 EET}
+    {2658175200 10800 1 EEST}
+    {2673900000 7200 0 EET}
+    {2689624800 10800 1 EEST}
+    {2705349600 7200 0 EET}
+    {2721679200 10800 1 EEST}
+    {2736799200 7200 0 EET}
+    {2753128800 10800 1 EEST}
+    {2768248800 7200 0 EET}
+    {2784578400 10800 1 EEST}
+    {2800303200 7200 0 EET}
+    {2816028000 10800 1 EEST}
+    {2831752800 7200 0 EET}
+    {2847477600 10800 1 EEST}
+    {2863202400 7200 0 EET}
+    {2879532000 10800 1 EEST}
+    {2894652000 7200 0 EET}
+    {2910981600 10800 1 EEST}
+    {2926101600 7200 0 EET}
+    {2942431200 10800 1 EEST}
+    {2957551200 7200 0 EET}
+    {2973880800 10800 1 EEST}
+    {2989605600 7200 0 EET}
+    {3005330400 10800 1 EEST}
+    {3021055200 7200 0 EET}
+    {3036780000 10800 1 EEST}
+    {3052504800 7200 0 EET}
+    {3068834400 10800 1 EEST}
+    {3083954400 7200 0 EET}
+    {3100284000 10800 1 EEST}
+    {3115404000 7200 0 EET}
+    {3131733600 10800 1 EEST}
+    {3147458400 7200 0 EET}
+    {3163183200 10800 1 EEST}
+    {3178908000 7200 0 EET}
+    {3194632800 10800 1 EEST}
+    {3210357600 7200 0 EET}
+    {3226687200 10800 1 EEST}
+    {3241807200 7200 0 EET}
+    {3258136800 10800 1 EEST}
+    {3273256800 7200 0 EET}
+    {3289586400 10800 1 EEST}
+    {3304706400 7200 0 EET}
+    {3321036000 10800 1 EEST}
+    {3336760800 7200 0 EET}
+    {3352485600 10800 1 EEST}
+    {3368210400 7200 0 EET}
+    {3383935200 10800 1 EEST}
+    {3399660000 7200 0 EET}
+    {3415989600 10800 1 EEST}
+    {3431109600 7200 0 EET}
+    {3447439200 10800 1 EEST}
+    {3462559200 7200 0 EET}
+    {3478888800 10800 1 EEST}
+    {3494613600 7200 0 EET}
+    {3510338400 10800 1 EEST}
+    {3526063200 7200 0 EET}
+    {3541788000 10800 1 EEST}
+    {3557512800 7200 0 EET}
+    {3573237600 10800 1 EEST}
+    {3588962400 7200 0 EET}
+    {3605292000 10800 1 EEST}
+    {3620412000 7200 0 EET}
+    {3636741600 10800 1 EEST}
+    {3651861600 7200 0 EET}
+    {3668191200 10800 1 EEST}
+    {3683916000 7200 0 EET}
+    {3699640800 10800 1 EEST}
+    {3715365600 7200 0 EET}
+    {3731090400 10800 1 EEST}
+    {3746815200 7200 0 EET}
+    {3763144800 10800 1 EEST}
+    {3778264800 7200 0 EET}
+    {3794594400 10800 1 EEST}
+    {3809714400 7200 0 EET}
+    {3826044000 10800 1 EEST}
+    {3841164000 7200 0 EET}
+    {3857493600 10800 1 EEST}
+    {3873218400 7200 0 EET}
+    {3888943200 10800 1 EEST}
+    {3904668000 7200 0 EET}
+    {3920392800 10800 1 EEST}
+    {3936117600 7200 0 EET}
+    {3952447200 10800 1 EEST}
+    {3967567200 7200 0 EET}
+    {3983896800 10800 1 EEST}
+    {3999016800 7200 0 EET}
+    {4015346400 10800 1 EEST}
+    {4031071200 7200 0 EET}
+    {4046796000 10800 1 EEST}
+    {4062520800 7200 0 EET}
+    {4078245600 10800 1 EEST}
+    {4093970400 7200 0 EET}
 }
diff --git a/library/tzdata/Asia/Jerusalem b/library/tzdata/Asia/Jerusalem
index 613eadd..7662680 100644
--- a/library/tzdata/Asia/Jerusalem
+++ b/library/tzdata/Asia/Jerusalem
@@ -1,8 +1,8 @@
 # created by tools/tclZIC.tcl - do not edit
 
 set TZData(:Asia/Jerusalem) {
-    {-9223372036854775808 8456 0 LMT}
-    {-2840149256 8440 0 JMT}
+    {-9223372036854775808 8454 0 LMT}
+    {-2840149254 8440 0 JMT}
     {-1641003640 7200 0 IST}
     {-933645600 10800 1 IDT}
     {-857358000 7200 0 IST}
@@ -96,177 +96,177 @@ set TZData(:Asia/Jerusalem) {
     {1333065600 10800 1 IDT}
     {1348354800 7200 0 IST}
     {1364515200 10800 1 IDT}
-    {1381014000 7200 0 IST}
+    {1382828400 7200 0 IST}
     {1395964800 10800 1 IDT}
-    {1412463600 7200 0 IST}
+    {1414278000 7200 0 IST}
     {1427414400 10800 1 IDT}
-    {1443913200 7200 0 IST}
+    {1445727600 7200 0 IST}
     {1458864000 10800 1 IDT}
-    {1475362800 7200 0 IST}
+    {1477782000 7200 0 IST}
     {1490313600 10800 1 IDT}
-    {1507417200 7200 0 IST}
+    {1509231600 7200 0 IST}
     {1521763200 10800 1 IDT}
-    {1538866800 7200 0 IST}
+    {1540681200 7200 0 IST}
     {1553817600 10800 1 IDT}
-    {1570316400 7200 0 IST}
+    {1572130800 7200 0 IST}
     {1585267200 10800 1 IDT}
-    {1601766000 7200 0 IST}
+    {1603580400 7200 0 IST}
     {1616716800 10800 1 IDT}
-    {1633215600 7200 0 IST}
+    {1635634800 7200 0 IST}
     {1648166400 10800 1 IDT}
-    {1664665200 7200 0 IST}
+    {1667084400 7200 0 IST}
     {1679616000 10800 1 IDT}
-    {1696719600 7200 0 IST}
+    {1698534000 7200 0 IST}
     {1711670400 10800 1 IDT}
-    {1728169200 7200 0 IST}
+    {1729983600 7200 0 IST}
     {1743120000 10800 1 IDT}
-    {1759618800 7200 0 IST}
+    {1761433200 7200 0 IST}
     {1774569600 10800 1 IDT}
-    {1791068400 7200 0 IST}
+    {1792882800 7200 0 IST}
     {1806019200 10800 1 IDT}
-    {1822604400 7200 0 IST}
+    {1824937200 7200 0 IST}
     {1837468800 10800 1 IDT}
-    {1854572400 7200 0 IST}
+    {1856386800 7200 0 IST}
     {1868918400 10800 1 IDT}
-    {1886022000 7200 0 IST}
+    {1887836400 7200 0 IST}
     {1900972800 10800 1 IDT}
-    {1917471600 7200 0 IST}
+    {1919286000 7200 0 IST}
     {1932422400 10800 1 IDT}
-    {1948921200 7200 0 IST}
+    {1950735600 7200 0 IST}
     {1963872000 10800 1 IDT}
-    {1980370800 7200 0 IST}
+    {1982790000 7200 0 IST}
     {1995321600 10800 1 IDT}
-    {2011820400 7200 0 IST}
+    {2014239600 7200 0 IST}
     {2026771200 10800 1 IDT}
-    {2043874800 7200 0 IST}
+    {2045689200 7200 0 IST}
     {2058220800 10800 1 IDT}
-    {2075324400 7200 0 IST}
+    {2077138800 7200 0 IST}
     {2090275200 10800 1 IDT}
-    {2106774000 7200 0 IST}
+    {2108588400 7200 0 IST}
     {2121724800 10800 1 IDT}
-    {2138223600 7200 0 IST}
+    {2140038000 7200 0 IST}
     {2153174400 10800 1 IDT}
-    {2169673200 7200 0 IST}
+    {2172092400 7200 0 IST}
     {2184624000 10800 1 IDT}
-    {2201122800 7200 0 IST}
+    {2203542000 7200 0 IST}
     {2216073600 10800 1 IDT}
-    {2233177200 7200 0 IST}
+    {2234991600 7200 0 IST}
     {2248128000 10800 1 IDT}
-    {2264626800 7200 0 IST}
+    {2266441200 7200 0 IST}
     {2279577600 10800 1 IDT}
-    {2296076400 7200 0 IST}
+    {2297890800 7200 0 IST}
     {2311027200 10800 1 IDT}
-    {2327526000 7200 0 IST}
+    {2329340400 7200 0 IST}
     {2342476800 10800 1 IDT}
-    {2358975600 7200 0 IST}
+    {2361394800 7200 0 IST}
     {2373926400 10800 1 IDT}
-    {2391030000 7200 0 IST}
+    {2392844400 7200 0 IST}
     {2405376000 10800 1 IDT}
-    {2422479600 7200 0 IST}
+    {2424294000 7200 0 IST}
     {2437430400 10800 1 IDT}
-    {2453929200 7200 0 IST}
+    {2455743600 7200 0 IST}
     {2468880000 10800 1 IDT}
-    {2485378800 7200 0 IST}
+    {2487193200 7200 0 IST}
     {2500329600 10800 1 IDT}
-    {2516828400 7200 0 IST}
+    {2519247600 7200 0 IST}
     {2531779200 10800 1 IDT}
-    {2548278000 7200 0 IST}
+    {2550697200 7200 0 IST}
     {2563228800 10800 1 IDT}
-    {2580332400 7200 0 IST}
+    {2582146800 7200 0 IST}
     {2595283200 10800 1 IDT}
-    {2611782000 7200 0 IST}
+    {2613596400 7200 0 IST}
     {2626732800 10800 1 IDT}
-    {2643231600 7200 0 IST}
+    {2645046000 7200 0 IST}
     {2658182400 10800 1 IDT}
-    {2674681200 7200 0 IST}
+    {2676495600 7200 0 IST}
     {2689632000 10800 1 IDT}
-    {2706130800 7200 0 IST}
+    {2708550000 7200 0 IST}
     {2721081600 10800 1 IDT}
-    {2738185200 7200 0 IST}
+    {2739999600 7200 0 IST}
     {2752531200 10800 1 IDT}
-    {2769634800 7200 0 IST}
+    {2771449200 7200 0 IST}
     {2784585600 10800 1 IDT}
-    {2801084400 7200 0 IST}
+    {2802898800 7200 0 IST}
     {2816035200 10800 1 IDT}
-    {2832534000 7200 0 IST}
+    {2834348400 7200 0 IST}
     {2847484800 10800 1 IDT}
-    {2863983600 7200 0 IST}
+    {2866402800 7200 0 IST}
     {2878934400 10800 1 IDT}
-    {2895433200 7200 0 IST}
+    {2897852400 7200 0 IST}
     {2910384000 10800 1 IDT}
-    {2927487600 7200 0 IST}
+    {2929302000 7200 0 IST}
     {2941833600 10800 1 IDT}
-    {2958937200 7200 0 IST}
+    {2960751600 7200 0 IST}
     {2973888000 10800 1 IDT}
-    {2990386800 7200 0 IST}
+    {2992201200 7200 0 IST}
     {3005337600 10800 1 IDT}
-    {3021836400 7200 0 IST}
+    {3023650800 7200 0 IST}
     {3036787200 10800 1 IDT}
-    {3053286000 7200 0 IST}
+    {3055705200 7200 0 IST}
     {3068236800 10800 1 IDT}
-    {3084735600 7200 0 IST}
+    {3087154800 7200 0 IST}
     {3099686400 10800 1 IDT}
-    {3116790000 7200 0 IST}
+    {3118604400 7200 0 IST}
     {3131740800 10800 1 IDT}
-    {3148239600 7200 0 IST}
+    {3150054000 7200 0 IST}
     {3163190400 10800 1 IDT}
-    {3179689200 7200 0 IST}
+    {3181503600 7200 0 IST}
     {3194640000 10800 1 IDT}
-    {3211138800 7200 0 IST}
+    {3212953200 7200 0 IST}
     {3226089600 10800 1 IDT}
-    {3242588400 7200 0 IST}
+    {3245007600 7200 0 IST}
     {3257539200 10800 1 IDT}
-    {3274642800 7200 0 IST}
+    {3276457200 7200 0 IST}
     {3288988800 10800 1 IDT}
-    {3306092400 7200 0 IST}
+    {3307906800 7200 0 IST}
     {3321043200 10800 1 IDT}
-    {3337542000 7200 0 IST}
+    {3339356400 7200 0 IST}
     {3352492800 10800 1 IDT}
-    {3368991600 7200 0 IST}
+    {3370806000 7200 0 IST}
     {3383942400 10800 1 IDT}
-    {3400441200 7200 0 IST}
+    {3402860400 7200 0 IST}
     {3415392000 10800 1 IDT}
-    {3431890800 7200 0 IST}
+    {3434310000 7200 0 IST}
     {3446841600 10800 1 IDT}
-    {3463945200 7200 0 IST}
+    {3465759600 7200 0 IST}
     {3478896000 10800 1 IDT}
-    {3495394800 7200 0 IST}
+    {3497209200 7200 0 IST}
     {3510345600 10800 1 IDT}
-    {3526844400 7200 0 IST}
+    {3528658800 7200 0 IST}
     {3541795200 10800 1 IDT}
-    {3558294000 7200 0 IST}
+    {3560108400 7200 0 IST}
     {3573244800 10800 1 IDT}
-    {3589743600 7200 0 IST}
+    {3592162800 7200 0 IST}
     {3604694400 10800 1 IDT}
-    {3621798000 7200 0 IST}
+    {3623612400 7200 0 IST}
     {3636144000 10800 1 IDT}
-    {3653247600 7200 0 IST}
+    {3655062000 7200 0 IST}
     {3668198400 10800 1 IDT}
-    {3684697200 7200 0 IST}
+    {3686511600 7200 0 IST}
     {3699648000 10800 1 IDT}
-    {3716146800 7200 0 IST}
+    {3717961200 7200 0 IST}
     {3731097600 10800 1 IDT}
-    {3747596400 7200 0 IST}
+    {3750015600 7200 0 IST}
     {3762547200 10800 1 IDT}
-    {3779046000 7200 0 IST}
+    {3781465200 7200 0 IST}
     {3793996800 10800 1 IDT}
-    {3811100400 7200 0 IST}
+    {3812914800 7200 0 IST}
     {3825446400 10800 1 IDT}
-    {3842550000 7200 0 IST}
+    {3844364400 7200 0 IST}
     {3857500800 10800 1 IDT}
-    {3873999600 7200 0 IST}
+    {3875814000 7200 0 IST}
     {3888950400 10800 1 IDT}
-    {3905449200 7200 0 IST}
+    {3907263600 7200 0 IST}
     {3920400000 10800 1 IDT}
-    {3936898800 7200 0 IST}
+    {3939318000 7200 0 IST}
     {3951849600 10800 1 IDT}
-    {3968348400 7200 0 IST}
+    {3970767600 7200 0 IST}
     {3983299200 10800 1 IDT}
-    {4000402800 7200 0 IST}
+    {4002217200 7200 0 IST}
     {4015353600 10800 1 IDT}
-    {4031852400 7200 0 IST}
+    {4033666800 7200 0 IST}
     {4046803200 10800 1 IDT}
-    {4063302000 7200 0 IST}
+    {4065116400 7200 0 IST}
     {4078252800 10800 1 IDT}
-    {4094751600 7200 0 IST}
+    {4096566000 7200 0 IST}
 }
diff --git a/unix/Makefile.in b/unix/Makefile.in
index 09df5f0..659f6c7 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 tclTomMathStubLib.o tclOOStubLib.o ${COMPAT_OBJS}
 
 UNIX_OBJS = tclUnixChan.o tclUnixEvent.o tclUnixFCmd.o \
 	tclUnixFile.o tclUnixPipe.o tclUnixSock.o \
@@ -471,7 +471,6 @@ OO_SRCS = \
 
 STUB_SRCS = \
 	$(GENERIC_DIR)/tclStubLib.c \
-	$(GENERIC_DIR)/tclStubLibTbl.c \
 	$(GENERIC_DIR)/tclTomMathStubLib.c \
 	$(GENERIC_DIR)/tclOOStubLib.c
 
@@ -1689,9 +1688,6 @@ Zzutil.o:    $(ZLIB_DIR)/zutil.c
 tclStubLib.o: $(GENERIC_DIR)/tclStubLib.c
 	$(CC) -c $(STUB_CC_SWITCHES) $(GENERIC_DIR)/tclStubLib.c
 
-tclStubLibTbl.o: $(GENERIC_DIR)/tclStubLibTbl.c
-	$(CC) -c $(STUB_CC_SWITCHES) $(GENERIC_DIR)/tclStubLibTbl.c
-
 tclTomMathStubLib.o: $(GENERIC_DIR)/tclTomMathStubLib.c
 	$(CC) -c $(STUB_CC_SWITCHES) $(GENERIC_DIR)/tclTomMathStubLib.c
 
diff --git a/unix/configure b/unix/configure
index 7626343..f219255 100755
--- a/unix/configure
+++ b/unix/configure
@@ -7727,11 +7727,12 @@ fi
 	OpenBSD-*)
 	    arch=`arch -s`
 	    case "$arch" in
-	    m88k|vax)
+	    vax)
 		# Equivalent using configure option --disable-load
 		# Step 4 will set the necessary variables
 		DL_OBJS=""
 		SHLIB_LD_LIBS=""
+		LDFLAGS=""
 		;;
 	    *)
 		SHLIB_CFLAGS="-fPIC"
@@ -7746,10 +7747,11 @@ fi
 
 		LD_SEARCH_FLAGS=${CC_SEARCH_FLAGS}
 		SHARED_LIB_SUFFIX='${TCL_TRIM_DOTS}.so.${SHLIB_VERSION}'
+		LDFLAGS="-Wl,-export-dynamic"
 		;;
 	    esac
 	    case "$arch" in
-	    m88k|vax)
+	    vax)
 		CFLAGS_OPTIMIZE="-O1"
 		;;
 	    sh)
@@ -7759,43 +7761,6 @@ fi
 		CFLAGS_OPTIMIZE="-O2"
 		;;
 	    esac
-	    echo "$as_me:$LINENO: checking for ELF" >&5
-echo $ECHO_N "checking for ELF... $ECHO_C" >&6
-if test "${tcl_cv_ld_elf+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
-else
-
-		cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-
-#ifdef __ELF__
-	yes
-#endif
-
-_ACEOF
-if (eval "$ac_cpp conftest.$ac_ext") 2>&5 |
-  $EGREP "yes" >/dev/null 2>&1; then
-  tcl_cv_ld_elf=yes
-else
-  tcl_cv_ld_elf=no
-fi
-rm -f conftest*
-
-fi
-echo "$as_me:$LINENO: result: $tcl_cv_ld_elf" >&5
-echo "${ECHO_T}$tcl_cv_ld_elf" >&6
-	    if test $tcl_cv_ld_elf = yes; then
-
-		LDFLAGS=-Wl,-export-dynamic
-
-else
-  LDFLAGS=""
-fi
-
 	    if test "${TCL_THREADS}" = "1"; then
 
 		# On OpenBSD:	Compile with -pthread
@@ -9788,7 +9753,7 @@ cat confdefs.h >>conftest.$ac_ext
 cat >>conftest.$ac_ext <<_ACEOF
 /* end confdefs.h.  */
 #include <sys/types.h>
-#include <sys/dirent.h>
+#include <dirent.h>
 int
 main ()
 {
diff --git a/unix/tcl.m4 b/unix/tcl.m4
index 43e2b78..b9b6532 100644
--- a/unix/tcl.m4
+++ b/unix/tcl.m4
@@ -1473,11 +1473,12 @@ AC_DEFUN([SC_CONFIG_CFLAGS], [
 	OpenBSD-*)
 	    arch=`arch -s`
 	    case "$arch" in
-	    m88k|vax)
+	    vax)
 		# Equivalent using configure option --disable-load
 		# Step 4 will set the necessary variables
 		DL_OBJS=""
 		SHLIB_LD_LIBS=""
+		LDFLAGS=""
 		;;
 	    *)
 		SHLIB_CFLAGS="-fPIC"
@@ -1489,10 +1490,11 @@ AC_DEFUN([SC_CONFIG_CFLAGS], [
 		    CC_SEARCH_FLAGS='-Wl,-rpath,${LIB_RUNTIME_DIR}'])
 		LD_SEARCH_FLAGS=${CC_SEARCH_FLAGS}
 		SHARED_LIB_SUFFIX='${TCL_TRIM_DOTS}.so.${SHLIB_VERSION}'
+		LDFLAGS="-Wl,-export-dynamic"
 		;;
 	    esac
 	    case "$arch" in
-	    m88k|vax)
+	    vax)
 		CFLAGS_OPTIMIZE="-O1"
 		;;
 	    sh)
@@ -1502,15 +1504,6 @@ AC_DEFUN([SC_CONFIG_CFLAGS], [
 		CFLAGS_OPTIMIZE="-O2"
 		;;
 	    esac
-	    AC_CACHE_CHECK([for ELF], tcl_cv_ld_elf, [
-		AC_EGREP_CPP(yes, [
-#ifdef __ELF__
-	yes
-#endif
-		], tcl_cv_ld_elf=yes, tcl_cv_ld_elf=no)])
-	    AS_IF([test $tcl_cv_ld_elf = yes], [
-		LDFLAGS=-Wl,-export-dynamic
-	    ], [LDFLAGS=""])
 	    AS_IF([test "${TCL_THREADS}" = "1"], [
 		# On OpenBSD:	Compile with -pthread
 		#		Don't link with -lpthread
@@ -2255,9 +2248,9 @@ AC_DEFUN([SC_PATH_X], [
     not_really_there=""
     if test "$no_x" = ""; then
 	if test "$x_includes" = ""; then
-	    AC_TRY_CPP([#include <X11/XIntrinsic.h>], , not_really_there="yes")
+	    AC_TRY_CPP([#include <X11/Xlib.h>], , not_really_there="yes")
 	else
-	    if test ! -r $x_includes/X11/Intrinsic.h; then
+	    if test ! -r $x_includes/X11/Xlib.h; then
 		not_really_there="yes"
 	    fi
 	fi
@@ -2265,11 +2258,11 @@ AC_DEFUN([SC_PATH_X], [
     if test "$no_x" = "yes" -o "$not_really_there" = "yes"; then
 	AC_MSG_CHECKING([for X11 header files])
 	found_xincludes="no"
-	AC_TRY_CPP([#include <X11/Intrinsic.h>], found_xincludes="yes", found_xincludes="no")
+	AC_TRY_CPP([#include <X11/Xlib.h>], found_xincludes="yes", found_xincludes="no")
 	if test "$found_xincludes" = "no"; then
 	    dirs="/usr/unsupported/include /usr/local/include /usr/X386/include /usr/X11R6/include /usr/X11R5/include /usr/include/X11R5 /usr/include/X11R4 /usr/openwin/include /usr/X11/include /usr/sww/include"
 	    for i in $dirs ; do
-		if test -r $i/X11/Intrinsic.h; then
+		if test -r $i/X11/Xlib.h; then
 		    AC_MSG_RESULT([$i])
 		    XINCLUDES=" -I$i"
 		    found_xincludes="yes"
@@ -2640,7 +2633,7 @@ AC_DEFUN([SC_TCL_64BIT_FLAGS], [
 	# Now check for auxiliary declarations
 	AC_CACHE_CHECK([for struct dirent64], tcl_cv_struct_dirent64,[
 	    AC_TRY_COMPILE([#include <sys/types.h>
-#include <sys/dirent.h>],[struct dirent64 p;],
+#include <dirent.h>],[struct dirent64 p;],
 		tcl_cv_struct_dirent64=yes,tcl_cv_struct_dirent64=no)])
 	if test "x${tcl_cv_struct_dirent64}" = "xyes" ; then
 	    AC_DEFINE(HAVE_STRUCT_DIRENT64, 1, [Is 'struct dirent64' in <sys/types.h>?])
diff --git a/unix/tclUnixNotfy.c b/unix/tclUnixNotfy.c
index b87af1b..aacc8d2d 100644
--- a/unix/tclUnixNotfy.c
+++ b/unix/tclUnixNotfy.c
@@ -96,7 +96,7 @@ typedef struct ThreadSpecificData {
 	 * that an event is ready to be processed
 	 * by sending this event. */
     void *hwnd;			/* Messaging window. */
-#else
+#else /* !__CYGWIN__ */
     Tcl_Condition waitCV;	/* Any other thread alerts a notifier that an
 				 * event is ready to be processed by signaling
 				 * this condition variable. */
@@ -184,9 +184,9 @@ static Tcl_ThreadId notifierThread;
  */
 
 #ifdef TCL_THREADS
-static void		NotifierThreadProc(ClientData clientData);
+static void	NotifierThreadProc(ClientData clientData);
 #endif
-static int		FileHandlerEventProc(Tcl_Event *evPtr, int flags);
+static int	FileHandlerEventProc(Tcl_Event *evPtr, int flags);
 
 /*
  * Import of Windows API when building threaded with Cygwin.
@@ -213,14 +213,14 @@ typedef struct {
     void *hCursor;
     void *hbrBackground;
     void *lpszMenuName;
-    void *lpszClassName;
+    const void *lpszClassName;
 } WNDCLASS;
 
 extern void __stdcall	CloseHandle(void *);
 extern void *__stdcall	CreateEventW(void *, unsigned char, unsigned char,
 			    void *);
-extern void * __stdcall	CreateWindowExW(void *, void *, void *, DWORD, int,
-			    int, int, int, void *, void *, void *, void *);
+extern void * __stdcall	CreateWindowExW(void *, const void *, const void *,
+			    DWORD, int, int, int, int, void *, void *, void *, void *);
 extern DWORD __stdcall	DefWindowProcW(void *, int, void *, void *);
 extern unsigned char __stdcall	DestroyWindow(void *);
 extern int __stdcall	DispatchMessageW(const MSG *);
diff --git a/unix/tclUnixPort.h b/unix/tclUnixPort.h
index fde1909..2ade1c0 100644
--- a/unix/tclUnixPort.h
+++ b/unix/tclUnixPort.h
@@ -700,8 +700,6 @@ typedef int socklen_t;
 
 #ifdef TCL_THREADS
 #   include <pthread.h>
-#   undef inet_ntoa
-#   define inet_ntoa(x)	TclpInetNtoa(x)
 #endif /* TCL_THREADS */
 
 /* FIXME - Hyper-enormous platform assumption! */
diff --git a/unix/tclUnixSock.c b/unix/tclUnixSock.c
index 528f009..9c3d7eb 100644
--- a/unix/tclUnixSock.c
+++ b/unix/tclUnixSock.c
@@ -1131,7 +1131,7 @@ Tcl_OpenTcpClient(
 {
     TcpState *state;
     const char *errorMsg = NULL;
-    struct addrinfo *addrlist = NULL, *myaddrlist = NULL;
+    void *addrlist = NULL, *myaddrlist = NULL;
     char channelName[SOCK_CHAN_LENGTH];
 
     /*
@@ -1276,7 +1276,8 @@ Tcl_OpenTcpServer(
     ClientData acceptProcData)	/* Data for the callback. */
 {
     int status = 0, sock = -1, reuseaddr = 1, chosenport = 0;
-    struct addrinfo *addrlist = NULL, *addrPtr;	/* socket address */
+    void *addrlist = NULL;
+    struct addrinfo *addrPtr;	/* socket address */
     TcpState *statePtr = NULL;
     char channelName[SOCK_CHAN_LENGTH];
     const char *errorMsg = NULL;
diff --git a/unix/tclUnixThrd.c b/unix/tclUnixThrd.c
index 789dbb6..f469341 100644
--- a/unix/tclUnixThrd.c
+++ b/unix/tclUnixThrd.c
@@ -659,6 +659,7 @@ TclpReaddir(
     return TclOSreaddir(dir);
 }
 
+#undef TclpInetNtoa
 char *
 TclpInetNtoa(
     struct in_addr addr)
diff --git a/unix/tclXtNotify.c b/unix/tclXtNotify.c
index e289e8c..a5d92d6 100644
--- a/unix/tclXtNotify.c
+++ b/unix/tclXtNotify.c
@@ -77,10 +77,10 @@ static int initialized = 0;
  */
 
 static int		FileHandlerEventProc(Tcl_Event *evPtr, int flags);
-static void		FileProc(ClientData clientData, int *source,
+static void		FileProc(XtPointer clientData, int *source,
 			    XtInputId *id);
 static void		NotifierExitHandler(ClientData clientData);
-static void		TimerProc(ClientData clientData, XtIntervalId *id);
+static void		TimerProc(XtPointer clientData, XtIntervalId *id);
 static void		CreateFileHandler(int fd, int mask,
 			    Tcl_FileProc *proc, ClientData clientData);
 static void		DeleteFileHandler(int fd);
@@ -181,7 +181,7 @@ TclSetAppContext(
 void
 InitNotifier(void)
 {
-    Tcl_NotifierProcs notifier;
+    Tcl_NotifierProcs np;
 
     /*
      * Only reinitialize if we are not in exit handling. The notifier can get
@@ -193,11 +193,15 @@ InitNotifier(void)
 	return;
     }
 
-    notifier.createFileHandlerProc = CreateFileHandler;
-    notifier.deleteFileHandlerProc = DeleteFileHandler;
-    notifier.setTimerProc = SetTimer;
-    notifier.waitForEventProc = WaitForEvent;
-    Tcl_SetNotifier(&notifier);
+    np.createFileHandlerProc = CreateFileHandler;
+    np.deleteFileHandlerProc = DeleteFileHandler;
+    np.setTimerProc = SetTimer;
+    np.waitForEventProc = WaitForEvent;
+    np.initNotifierProc = Tcl_InitNotifier;
+    np.finalizeNotifierProc = Tcl_FinalizeNotifier;
+    np.alertNotifierProc = Tcl_AlertNotifier;
+    np.serviceModeHookProc = Tcl_ServiceModeHook;
+    Tcl_SetNotifier(&np);
 
     /*
      * DO NOT create the application context yet; doing so would prevent
@@ -205,7 +209,7 @@ InitNotifier(void)
      */
 
     initialized = 1;
-    memset(&notifier, 0, sizeof(notifier));
+    memset(&np, 0, sizeof(np));
     Tcl_CreateExitHandler(NotifierExitHandler, NULL);
 }
 
@@ -301,7 +305,7 @@ SetTimer(
 
 static void
 TimerProc(
-    ClientData clientData, /* Not used. */
+    XtPointer clientData, /* Not used. */
     XtIntervalId *id)
 {
     if (*id != notifier.currentTimeout) {
@@ -488,7 +492,7 @@ DeleteFileHandler(
 
 static void
 FileProc(
-    ClientData clientData,
+    XtPointer clientData,
     int *fd,
     XtInputId *id)
 {
diff --git a/win/Makefile.in b/win/Makefile.in
index 9b74f41..0e17ac6 100644
--- a/win/Makefile.in
+++ b/win/Makefile.in
@@ -386,7 +386,6 @@ REG_OBJS = tclWinReg.$(OBJEXT)
 
 STUB_OBJS = \
 	tclStubLib.$(OBJEXT) \
-	tclStubLibTbl.$(OBJEXT) \
 	tclTomMathStubLib.$(OBJEXT) \
 	tclOOStubLib.$(OBJEXT)
 
@@ -517,9 +516,6 @@ tclPkgConfig.${OBJEXT}: tclPkgConfig.c
 tclStubLib.${OBJEXT}: tclStubLib.c
 	$(CC) -c $(CC_SWITCHES) -DSTATIC_BUILD @DEPARG@ $(CC_OBJNAME)
 
-tclStubLibTbl.${OBJEXT}: tclStubLibTbl.c
-	$(CC) -c $(CC_SWITCHES) -DSTATIC_BUILD @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 da1eaf4..31a927e 100644
--- a/win/makefile.bc
+++ b/win/makefile.bc
@@ -280,7 +280,6 @@ TCLOBJS	= \
 
 TCLSTUBOBJS	= \
 	$(TMPDIR)\tclStubLib.obj \
-	$(TMPDIR)\tclStubLibTbl.obj \
 	$(TMPDIR)\tclTomMathStubLib.obj \
 	$(TMPDIR)\tclOOStubLib.obj
 
@@ -530,9 +529,6 @@ $(TMPDIR)\tclWinDde.obj : $(WINDIR)\tclWinDde.c
 $(TMPDIR)\tclStubLib.obj : $(GENERICDIR)\tclStubLib.c
 	$(cc32) $(TCL_CFLAGS) -DSTATIC_BUILD -o$(TMPDIR)\$@ $?
 
-$(TMPDIR)\tclStubLibTbl.obj : $(GENERICDIR)\tclStubLibTbl.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 3cb460d..09a1135 100644
--- a/win/makefile.vc
+++ b/win/makefile.vc
@@ -451,7 +451,6 @@ TCLOBJS = $(COREOBJS) $(ZLIBOBJS) $(TOMMATHOBJS) $(PLATFORMOBJS)
 
 TCLSTUBOBJS = \
 	$(TMP_DIR)\tclStubLib.obj \
-	$(TMP_DIR)\tclStubLibTbl.obj \
 	$(TMP_DIR)\tclTomMathStubLib.obj \
 	$(TMP_DIR)\tclOOStubLib.obj
 
@@ -981,9 +980,6 @@ $(TMP_DIR)\tclWinDde.obj: $(WINDIR)\tclWinDde.c
 $(TMP_DIR)\tclStubLib.obj: $(GENERICDIR)\tclStubLib.c
 	$(cc32) $(STUB_CFLAGS) -Zl -DSTATIC_BUILD $(TCL_INCLUDES) -Fo$@ $?
 
-$(TMP_DIR)\tclStubLibTbl.obj: $(GENERICDIR)\tclStubLibTbl.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..57ec6bf 100644
--- a/win/tcl.dsp
+++ b/win/tcl.dsp
@@ -1300,10 +1300,6 @@ SOURCE=..\generic\tclStubLib.c
 # End Source File
 # Begin Source File
 
-SOURCE=..\generic\tclStubLibTbl.c
-# End Source File
-# Begin Source File
-
 SOURCE=..\generic\tclOOStubLib.c
 # End Source File
 # Begin Source File
diff --git a/win/tclWinSock.c b/win/tclWinSock.c
index 1a74354..f4d5a90 100644
--- a/win/tclWinSock.c
+++ b/win/tclWinSock.c
@@ -1131,9 +1131,10 @@ CreateSocket(
     int asyncConnect = 0;	/* Will be 1 if async connect is in
 				 * progress. */
     unsigned short chosenport = 0;
-    struct addrinfo *addrlist = NULL, *addrPtr;
+    void *addrlist = NULL, *myaddrlist = NULL;
+    struct addrinfo *addrPtr;
 				/* Socket address to connect to. */
-    struct addrinfo *myaddrlist = NULL, *myaddrPtr;
+    struct addrinfo *myaddrPtr;
 				/* Socket address for our side. */
     const char *errorMsg = NULL;
     SOCKET sock = INVALID_SOCKET;
@@ -2735,6 +2736,7 @@ TclWinSetSockOpt(
     return setsockopt(s, level, optname, optval, optlen);
 }
 
+#undef TclpInetNtoa
 char *
 TclpInetNtoa(
     struct in_addr addr)