Version 5 of [Patch 976496]

3 files changed, 16 insertions, 3 deletions

diff --git a/unix/Makefile.in b/unix/Makefile.in
index f1d6f57..ee369c3 100644
--- a/unix/Makefile.in
+++ b/unix/Makefile.in
@@ -5,7 +5,7 @@
 # "autoconf" program (constructs like "@foo@" will get replaced in the
 # actual Makefile.
 #
-# RCS: @(#) $Id: Makefile.in,v 1.138 2004/06/11 21:30:08 dgp Exp $
+# RCS: @(#) $Id: Makefile.in,v 1.139 2004/06/24 01:29:03 mistachkin Exp $
 
 VERSION 		= @TCL_VERSION@
 MAJOR_VERSION		= @TCL_MAJOR_VERSION@
@@ -313,8 +313,8 @@ GENERIC_OBJS = regcomp.o regexec.o regfree.o regerror.o tclAlloc.o \
 	tclObj.o tclPanic.o tclParse.o tclParseExpr.o tclPathObj.o tclPipe.o \
 	tclPkg.o tclPkgConfig.o tclPosixStr.o tclPreserve.o tclProc.o tclRegexp.o \
 	tclResolve.o tclResult.o tclScan.o tclStringObj.o tclThread.o \
-	 tclThreadAlloc.o tclThreadJoin.o tclStubInit.o tclStubLib.o \
-	tclTimer.o tclTrace.o tclUtf.o tclUtil.o tclVar.o
+	tclThreadAlloc.o tclThreadJoin.o tclThreadStorage.o tclStubInit.o \
+	tclStubLib.o tclTimer.o tclTrace.o tclUtf.o tclUtil.o tclVar.o
 
 STUB_LIB_OBJS = tclStubLib.o ${COMPAT_OBJS}
 
@@ -402,6 +402,7 @@ GENERIC_SRCS = \
 	$(GENERIC_DIR)/tclThread.c \
 	$(GENERIC_DIR)/tclThreadAlloc.c \
 	$(GENERIC_DIR)/tclThreadJoin.c \
+	$(GENERIC_DIR)/tclThreadStorage.c \
 	$(GENERIC_DIR)/tclTimer.c \
 	$(GENERIC_DIR)/tclTrace.c \
 	$(GENERIC_DIR)/tclUtil.c \
@@ -1050,6 +1051,9 @@ tclThreadAlloc.o: $(GENERIC_DIR)/tclThreadAlloc.c
 tclThreadJoin.o: $(GENERIC_DIR)/tclThreadJoin.c
 	$(CC) -c $(CC_SWITCHES) $(GENERIC_DIR)/tclThreadJoin.c
 
+tclThreadStorage.o: $(GENERIC_DIR)/tclThreadStorage.c
+	$(CC) -c $(CC_SWITCHES) $(GENERIC_DIR)/tclThreadStorage.c
+
 tclThreadTest.o: $(GENERIC_DIR)/tclThreadTest.c
 	$(CC) -c $(CC_SWITCHES) $(GENERIC_DIR)/tclThreadTest.c
 
diff --git a/unix/configure b/unix/configure
index dc672d8..0155bcb 100755
--- a/unix/configure
+++ b/unix/configure
@@ -2854,6 +2854,12 @@ _ACEOF
 #define USE_THREAD_ALLOC 1
 _ACEOF
 
+	# USE_THREAD_STORAGE tells us to use the new generic thread
+	# storage subsystem.
+	cat >>confdefs.h <<\_ACEOF
+#define USE_THREAD_STORAGE 1
+_ACEOF
+
 	cat >>confdefs.h <<\_ACEOF
 #define _REENTRANT 1
 _ACEOF
diff --git a/unix/tcl.m4 b/unix/tcl.m4
index 37bc2d8..a81ad6a 100644
--- a/unix/tcl.m4
+++ b/unix/tcl.m4
@@ -428,6 +428,9 @@ AC_DEFUN(SC_ENABLE_THREADS, [
 	# USE_THREAD_ALLOC tells us to try the special thread-based
 	# allocator that significantly reduces lock contention
 	AC_DEFINE(USE_THREAD_ALLOC)
+	# USE_THREAD_STORAGE tells us to use the new generic thread 
+	# storage subsystem. 
+	AC_DEFINE(USE_THREAD_STORAGE)
 	AC_DEFINE(_REENTRANT)
 	AC_DEFINE(_THREAD_SAFE)
 	AC_CHECK_LIB(pthread,pthread_mutex_init,tcl_ok=yes,tcl_ok=no)