From: kseitz <kseitz>
Date: Thu, 1 Aug 2002 01:36:14 +0000 (+0000)
Subject:         * generic/tclIntDecls.h (TclIntStubs): Do not include definitions
X-Git-Url: http://git.sourceforge.jp/view?a=commitdiff_plain;h=b1499e1513e14f2d83a96f2f24f0e44764696e77;p=pf3gnuchains%2Fsourceware.git

    * generic/tclIntDecls.h (TclIntStubs): Do not include definitions
        for tclpAlloc, tclpFree, or pRealloc on cygwin.

        * win/tcl.hpj.in: Copied here from tools/tcl.hpj.in.

        * win/tcl.m4 (SC_CONFIG_CFLAGS): Add TCL_DLL_BASE, DDE_DLL_BASE,
        and REG_DLL_BASE variables to define DLL image bases on cygwin.
        Do not link with "-e _WinMain@16" on cygwin.
        * win/configure.in (TCL_DLL_BASE): Substitute into makefile.
        (DDE_DLL_BASE): Likewise.
        (REG_DLL_BASE): Likewise.
        * win/configure: Regenerated.
        * win/Makefile.in: Use TCL_DLL_BASE, DDE_DLL_BASE, and
        REG_DLL_BASE to build DLLs.
---

diff --git a/tcl/ChangeLog b/tcl/ChangeLog
index 92c336faa1..8f69e668e1 100644
--- a/tcl/ChangeLog
+++ b/tcl/ChangeLog
@@ -1,3 +1,20 @@
+2002-07-31  Keith Seitz  <keiths@redhat.com>
+
+	* generic/tclIntDecls.h (TclIntStubs): Do not include definitions
+	for tclpAlloc, tclpFree, or pRealloc on cygwin.
+
+	* win/tcl.hpj.in: Copied here from tools/tcl.hpj.in.
+	
+	* win/tcl.m4 (SC_CONFIG_CFLAGS): Add TCL_DLL_BASE, DDE_DLL_BASE,
+	and REG_DLL_BASE variables to define DLL image bases on cygwin.
+	Do not link with "-e _WinMain@16" on cygwin.
+	* win/configure.in (TCL_DLL_BASE): Substitute into makefile.
+	(DDE_DLL_BASE): Likewise.
+	(REG_DLL_BASE): Likewise.
+	* win/configure: Regenerated.
+	* win/Makefile.in: Use TCL_DLL_BASE, DDE_DLL_BASE, and
+	REG_DLL_BASE to build DLLs.
+
 2002-07-30  Keith Seitz  <keiths@redhat.com>
 
 	From Mo DeJong  <supermo@bayarea.net>
diff --git a/tcl/generic/tclIntDecls.h b/tcl/generic/tclIntDecls.h
index 900fc2e9f0..2b2657840d 100644
--- a/tcl/generic/tclIntDecls.h
+++ b/tcl/generic/tclIntDecls.h
@@ -620,19 +620,25 @@ typedef struct TclIntStubs {
     int (*tclOpenFileChannelDeleteProc) _ANSI_ARGS_((TclOpenFileChannelProc_ * proc)); /* 66 */
     int (*tclOpenFileChannelInsertProc) _ANSI_ARGS_((TclOpenFileChannelProc_ * proc)); /* 67 */
     int (*tclpAccess) _ANSI_ARGS_((CONST char * path, int mode)); /* 68 */
+#if !defined(__CYGWIN__) || defined(__MINGW32__)
     char * (*tclpAlloc) _ANSI_ARGS_((unsigned int size)); /* 69 */
+#endif
     int (*tclpCopyFile) _ANSI_ARGS_((CONST char * source, CONST char * dest)); /* 70 */
     int (*tclpCopyDirectory) _ANSI_ARGS_((CONST char * source, CONST char * dest, Tcl_DString * errorPtr)); /* 71 */
     int (*tclpCreateDirectory) _ANSI_ARGS_((CONST char * path)); /* 72 */
     int (*tclpDeleteFile) _ANSI_ARGS_((CONST char * path)); /* 73 */
+#if !defined(__CYGWIN__) || defined(__MINGW32__)
     void (*tclpFree) _ANSI_ARGS_((char * ptr)); /* 74 */
+#endif
     unsigned long (*tclpGetClicks) _ANSI_ARGS_((void)); /* 75 */
     unsigned long (*tclpGetSeconds) _ANSI_ARGS_((void)); /* 76 */
     void (*tclpGetTime) _ANSI_ARGS_((Tcl_Time * time)); /* 77 */
     int (*tclpGetTimeZone) _ANSI_ARGS_((unsigned long time)); /* 78 */
     int (*tclpListVolumes) _ANSI_ARGS_((Tcl_Interp * interp)); /* 79 */
     Tcl_Channel (*tclpOpenFileChannel) _ANSI_ARGS_((Tcl_Interp * interp, char * fileName, char * modeString, int permissions)); /* 80 */
+#if !defined(__CYGWIN__) || defined(__MINGW32__)
     char * (*tclpRealloc) _ANSI_ARGS_((char * ptr, unsigned int size)); /* 81 */
+#endif
     int (*tclpRemoveDirectory) _ANSI_ARGS_((CONST char * path, int recursive, Tcl_DString * errorPtr)); /* 82 */
     int (*tclpRenameFile) _ANSI_ARGS_((CONST char * source, CONST char * dest)); /* 83 */
     void *reserved84;
diff --git a/tcl/win/Makefile.in b/tcl/win/Makefile.in
index f43ed26fb0..88a749c923 100644
--- a/tcl/win/Makefile.in
+++ b/tcl/win/Makefile.in
@@ -124,12 +124,15 @@ LIBPREFIX		= @LIBPREFIX@
 TCL_STUB_LIB_FILE	= @TCL_STUB_LIB_FILE@
 TCL_DLL_FILE		= @TCL_DLL_FILE@
 TCL_LIB_FILE		= @TCL_LIB_FILE@
+TCL_DLL_BASE		= @TCL_DLL_BASE@
 GNU_TCL_LIB_FILE	= @GNU_TCL_LIB_FILE@
 MSVC_TCL_LIB_FILE	= @MSVC_TCL_LIB_FILE@
 DDE_DLL_FILE		= @DDE_DLL_FILE@
 DDE_LIB_FILE		= @DDE_LIB_FILE@
+DDE_DLL_BASE		= @DDE_DLL_BASE@
 REG_DLL_FILE		= @REG_DLL_FILE@
 REG_LIB_FILE		= @REG_LIB_FILE@
+REG_DLL_BASE		= @REG_DLL_BASE@
 PIPE_DLL_FILE		= @PIPE_DLL_FILE@
 
 SHARED_LIBRARIES 	= $(TCL_DLL_FILE) $(TCL_STUB_LIB_FILE) \
@@ -336,7 +339,7 @@ ${GNU_TCL_LIB_FILE}: ${TCL_DLL_FILE}
 
 ${TCL_DLL_FILE}: ${TCL_OBJS} tcl.$(RES)
 	@$(RM) ${TCL_DLL_FILE}
-	@MAKE_DLL@ ${TCL_OBJS} tcl.$(RES) $(SHLIB_LD_LIBS)
+	@MAKE_DLL@ ${TCL_OBJS} tcl.$(RES) $(SHLIB_LD_LIBS) $(TCL_DLL_BASE)
 
 ${MSVC_TCL_LIB_FILE}: ${TCL_OBJS} ${TCL_DLL_FILE}
 	@$(RM) ${TCL_LIB_FILE}
@@ -345,7 +348,8 @@ ${MSVC_TCL_LIB_FILE}: ${TCL_OBJS} ${TCL_DLL_FILE}
 
 ${DDE_DLL_FILE}: ${DDE_OBJS} ${TCL_STUB_LIB_FILE}
 	@$(RM) ${DDE_DLL_FILE}
-	@MAKE_DLL@ ${DDE_OBJS} $(TCL_STUB_LIB_FILE) $(SHLIB_LD_LIBS)
+	@MAKE_DLL@ ${DDE_OBJS} $(TCL_STUB_LIB_FILE) $(SHLIB_LD_LIBS) \
+	$(DDE_DLL_BASE)
 
 ${DDE_LIB_FILE}: ${DDE_OBJS} ${TCL_LIB_FILE}
 	@$(RM) ${DDE_LIB_FILE}
@@ -353,7 +357,8 @@ ${DDE_LIB_FILE}: ${DDE_OBJS} ${TCL_LIB_FILE}
 
 ${REG_DLL_FILE}: ${REG_OBJS} ${TCL_STUB_LIB_FILE}
 	@$(RM) ${REG_DLL_FILE}
-	@MAKE_DLL@ ${REG_OBJS} ${TCL_STUB_LIB_FILE} $(SHLIB_LD_LIBS)
+	@MAKE_DLL@ ${REG_OBJS} ${TCL_STUB_LIB_FILE} $(SHLIB_LD_LIBS) \
+	$(REG_DLL_BASE)
 
 ${REG_LIB_FILE}: ${REG_OBJS} ${TCL_LIB_FILE}
 	@$(RM) ${REG_LIB_FILE}
diff --git a/tcl/win/configure b/tcl/win/configure
index d16e09e651..e54d93f3cf 100755
--- a/tcl/win/configure
+++ b/tcl/win/configure
@@ -1420,6 +1420,9 @@ echo "configure:1374: checking compiler flags" >&5
 	    # Add SHLIB_LD_LIBS to the Make rule, not here.
 	    MAKE_DLL="\${SHLIB_LD} \$(LDFLAGS) -o \$@ ${extra_ldflags} \
 	        -Wl,--out-implib,\$(patsubst %.dll,lib%.a,\$@)"
+	    TCL_DLL_BASE="-Wl,--image-base=0x66000000"
+	    DDE_DLL_BASE="-Wl,--image-base=0x66100000"
+	    REG_DLL_BASE="-Wl,--image-base=0x66200000"
 
 	    LIBSUFFIX="\${DBGX}.a"
 	    DLLSUFFIX="\${DBGX}.dll"
@@ -1439,15 +1442,8 @@ echo "configure:1374: checking compiler flags" >&5
 
 	# Specify linker flags depending on the type of app being 
 	# built -- Console vs. Window.
-	#
-	# We need to pass -e _WinMain@16 so that ld will use
-	# WinMain() instead of main() as the entry point. We can't
-	# use autoconf to check for this case since it would need
-	# to run an executable and that does not work when
-	# cross compiling. Remove this -e workaround once we
-	# require a gcc that does not have this bug.
 	LDFLAGS_CONSOLE="-mconsole ${extra_ldflags}"
-	LDFLAGS_WINDOW="-mwindows -e _WinMain@16 ${extra_ldflags}"
+	LDFLAGS_WINDOW="-mwindows ${extra_ldflags}"
     else
 	SHLIB_LD="link -dll -nologo"
 	SHLIB_LD_LIBS="user32.lib advapi32.lib"
@@ -1517,7 +1513,7 @@ echo "configure:1374: checking compiler flags" >&5
 
 
     echo $ac_n "checking for build with symbols""... $ac_c" 1>&6
-echo "configure:1521: checking for build with symbols" >&5
+echo "configure:1517: checking for build with symbols" >&5
     # Check whether --enable-symbols or --disable-symbols was given.
 if test "${enable_symbols+set}" = set; then
   enableval="$enable_symbols"
@@ -1545,7 +1541,7 @@ fi
 #------------------------------------------------------------------------------
 
 echo $ac_n "checking how to run the C preprocessor""... $ac_c" 1>&6
-echo "configure:1549: checking how to run the C preprocessor" >&5
+echo "configure:1545: checking how to run the C preprocessor" >&5
 # On Suns, sometimes $CPP names a directory.
 if test -n "$CPP" && test -d "$CPP"; then
   CPP=
@@ -1560,13 +1556,13 @@ else
   # On the NeXT, cc -E runs the code through the compiler's parser,
   # not just through cpp.
   cat > conftest.$ac_ext <<EOF
-#line 1564 "configure"
+#line 1560 "configure"
 #include "confdefs.h"
 #include <assert.h>
 Syntax Error
 EOF
 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:1570: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:1566: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
 ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
 if test -z "$ac_err"; then
   :
@@ -1577,13 +1573,13 @@ else
   rm -rf conftest*
   CPP="${CC-cc} -E -traditional-cpp"
   cat > conftest.$ac_ext <<EOF
-#line 1581 "configure"
+#line 1577 "configure"
 #include "confdefs.h"
 #include <assert.h>
 Syntax Error
 EOF
 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:1587: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:1583: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
 ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
 if test -z "$ac_err"; then
   :
@@ -1594,13 +1590,13 @@ else
   rm -rf conftest*
   CPP="${CC-cc} -nologo -E"
   cat > conftest.$ac_ext <<EOF
-#line 1598 "configure"
+#line 1594 "configure"
 #include "confdefs.h"
 #include <assert.h>
 Syntax Error
 EOF
 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:1604: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:1600: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
 ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
 if test -z "$ac_err"; then
   :
@@ -1625,12 +1621,12 @@ fi
 echo "$ac_t""$CPP" 1>&6
 
 echo $ac_n "checking whether struct tm is in sys/time.h or time.h""... $ac_c" 1>&6
-echo "configure:1629: checking whether struct tm is in sys/time.h or time.h" >&5
+echo "configure:1625: checking whether struct tm is in sys/time.h or time.h" >&5
 if eval "test \"`echo '$''{'ac_cv_struct_tm'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   cat > conftest.$ac_ext <<EOF
-#line 1634 "configure"
+#line 1630 "configure"
 #include "confdefs.h"
 #include <sys/types.h>
 #include <time.h>
@@ -1638,7 +1634,7 @@ int main() {
 struct tm *tp; tp->tm_sec;
 ; return 0; }
 EOF
-if { (eval echo configure:1642: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:1638: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
   rm -rf conftest*
   ac_cv_struct_tm=time.h
 else
@@ -1663,17 +1659,17 @@ fi
 do
 ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
 echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
-echo "configure:1667: checking for $ac_hdr" >&5
+echo "configure:1663: checking for $ac_hdr" >&5
 if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   cat > conftest.$ac_ext <<EOF
-#line 1672 "configure"
+#line 1668 "configure"
 #include "confdefs.h"
 #include <$ac_hdr>
 EOF
 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:1677: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:1673: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
 ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
 if test -z "$ac_err"; then
   rm -rf conftest*
@@ -1700,12 +1696,12 @@ fi
 done
 
     echo $ac_n "checking whether time.h and sys/time.h may both be included""... $ac_c" 1>&6
-echo "configure:1704: checking whether time.h and sys/time.h may both be included" >&5
+echo "configure:1700: checking whether time.h and sys/time.h may both be included" >&5
 if eval "test \"`echo '$''{'ac_cv_header_time'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   cat > conftest.$ac_ext <<EOF
-#line 1709 "configure"
+#line 1705 "configure"
 #include "confdefs.h"
 #include <sys/types.h>
 #include <sys/time.h>
@@ -1714,7 +1710,7 @@ int main() {
 struct tm *tp;
 ; return 0; }
 EOF
-if { (eval echo configure:1718: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:1714: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
   rm -rf conftest*
   ac_cv_header_time=yes
 else
@@ -1735,12 +1731,12 @@ EOF
 fi
 
     echo $ac_n "checking for tm_zone in struct tm""... $ac_c" 1>&6
-echo "configure:1739: checking for tm_zone in struct tm" >&5
+echo "configure:1735: checking for tm_zone in struct tm" >&5
 if eval "test \"`echo '$''{'ac_cv_struct_tm_zone'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   cat > conftest.$ac_ext <<EOF
-#line 1744 "configure"
+#line 1740 "configure"
 #include "confdefs.h"
 #include <sys/types.h>
 #include <$ac_cv_struct_tm>
@@ -1748,7 +1744,7 @@ int main() {
 struct tm tm; tm.tm_zone;
 ; return 0; }
 EOF
-if { (eval echo configure:1752: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:1748: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
   rm -rf conftest*
   ac_cv_struct_tm_zone=yes
 else
@@ -1768,12 +1764,12 @@ EOF
 
 else
   echo $ac_n "checking for tzname""... $ac_c" 1>&6
-echo "configure:1772: checking for tzname" >&5
+echo "configure:1768: checking for tzname" >&5
 if eval "test \"`echo '$''{'ac_cv_var_tzname'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   cat > conftest.$ac_ext <<EOF
-#line 1777 "configure"
+#line 1773 "configure"
 #include "confdefs.h"
 #include <time.h>
 #ifndef tzname /* For SGI.  */
@@ -1783,7 +1779,7 @@ int main() {
 atoi(*tzname);
 ; return 0; }
 EOF
-if { (eval echo configure:1787: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:1783: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   ac_cv_var_tzname=yes
 else
@@ -1806,16 +1802,16 @@ fi
 
 
     echo $ac_n "checking tm_tzadj in struct tm""... $ac_c" 1>&6
-echo "configure:1810: checking tm_tzadj in struct tm" >&5
+echo "configure:1806: checking tm_tzadj in struct tm" >&5
     cat > conftest.$ac_ext <<EOF
-#line 1812 "configure"
+#line 1808 "configure"
 #include "confdefs.h"
 #include <time.h>
 int main() {
 struct tm tm; tm.tm_tzadj;
 ; return 0; }
 EOF
-if { (eval echo configure:1819: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:1815: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
   rm -rf conftest*
   cat >> confdefs.h <<\EOF
 #define HAVE_TM_TZADJ 1
@@ -1831,16 +1827,16 @@ fi
 rm -f conftest*
 
     echo $ac_n "checking tm_gmtoff in struct tm""... $ac_c" 1>&6
-echo "configure:1835: checking tm_gmtoff in struct tm" >&5
+echo "configure:1831: checking tm_gmtoff in struct tm" >&5
     cat > conftest.$ac_ext <<EOF
-#line 1837 "configure"
+#line 1833 "configure"
 #include "confdefs.h"
 #include <time.h>
 int main() {
 struct tm tm; tm.tm_gmtoff;
 ; return 0; }
 EOF
-if { (eval echo configure:1844: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:1840: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
   rm -rf conftest*
   cat >> confdefs.h <<\EOF
 #define HAVE_TM_GMTOFF 1
@@ -1861,9 +1857,9 @@ rm -f conftest*
     #
     have_timezone=no
     echo $ac_n "checking long timezone variable""... $ac_c" 1>&6
-echo "configure:1865: checking long timezone variable" >&5
+echo "configure:1861: checking long timezone variable" >&5
     cat > conftest.$ac_ext <<EOF
-#line 1867 "configure"
+#line 1863 "configure"
 #include "confdefs.h"
 #include <time.h>
 int main() {
@@ -1872,7 +1868,7 @@ extern long timezone;
 	    exit (0);
 ; return 0; }
 EOF
-if { (eval echo configure:1876: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:1872: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
   rm -rf conftest*
   have_timezone=yes
 	    cat >> confdefs.h <<\EOF
@@ -1893,9 +1889,9 @@ rm -f conftest*
     #
     if test "$have_timezone" = no; then
     echo $ac_n "checking time_t timezone variable""... $ac_c" 1>&6
-echo "configure:1897: checking time_t timezone variable" >&5
+echo "configure:1893: checking time_t timezone variable" >&5
     cat > conftest.$ac_ext <<EOF
-#line 1899 "configure"
+#line 1895 "configure"
 #include "confdefs.h"
 #include <time.h>
 int main() {
@@ -1904,7 +1900,7 @@ extern time_t timezone;
 	    exit (0);
 ; return 0; }
 EOF
-if { (eval echo configure:1908: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:1904: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
   rm -rf conftest*
   cat >> confdefs.h <<\EOF
 #define HAVE_TIMEZONE_VAR 1
@@ -1927,12 +1923,12 @@ rm -f conftest*
     #
     if test "$have_timezone" = yes; then
    	echo $ac_n "checking for timezone declaration""... $ac_c" 1>&6
-echo "configure:1931: checking for timezone declaration" >&5
+echo "configure:1927: checking for timezone declaration" >&5
    	
    	tzrx='^[ 	]*extern.*timezone'
    	
    	cat > conftest.$ac_ext <<EOF
-#line 1936 "configure"
+#line 1932 "configure"
 #include "confdefs.h"
 #include <time.h>
 EOF
@@ -1962,7 +1958,7 @@ rm -f conftest*
 
     if test "`uname -s`" = "AIX" ; then
 	echo $ac_n "checking for gettimeofday in -lbsd""... $ac_c" 1>&6
-echo "configure:1966: checking for gettimeofday in -lbsd" >&5
+echo "configure:1962: checking for gettimeofday in -lbsd" >&5
 ac_lib_var=`echo bsd'_'gettimeofday | sed 'y%./+-%__p_%'`
 if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
@@ -1970,7 +1966,7 @@ else
   ac_save_LIBS="$LIBS"
 LIBS="-lbsd  $LIBS"
 cat > conftest.$ac_ext <<EOF
-#line 1974 "configure"
+#line 1970 "configure"
 #include "confdefs.h"
 /* Override any gcc2 internal prototype to avoid an error.  */
 /* We use char because int might match the return type of a gcc2
@@ -1981,7 +1977,7 @@ int main() {
 gettimeofday()
 ; return 0; }
 EOF
-if { (eval echo configure:1985: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:1981: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   eval "ac_cv_lib_$ac_lib_var=yes"
 else
@@ -2018,17 +2014,17 @@ TCL_DBGX=${DBGX}
 
 ac_safe=`echo "errno.h" | sed 'y%./+-%__p_%'`
 echo $ac_n "checking for errno.h""... $ac_c" 1>&6
-echo "configure:2022: checking for errno.h" >&5
+echo "configure:2018: checking for errno.h" >&5
 if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   cat > conftest.$ac_ext <<EOF
-#line 2027 "configure"
+#line 2023 "configure"
 #include "confdefs.h"
 #include <errno.h>
 EOF
 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:2032: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:2028: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
 ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
 if test -z "$ac_err"; then
   rm -rf conftest*
@@ -2821,6 +2817,9 @@ CFG_TCL_EXPORT_FILE_SUFFIX=${TCL_EXPORT_FILE_SUFFIX}
 
 
 
+
+
+
 trap '' 1 2 15
 cat > confcache <<\EOF
 # This file is a shell script that caches the results of configure
@@ -2996,6 +2995,7 @@ s%@TCL_LIB_FILE@%$TCL_LIB_FILE%g
 s%@GNU_TCL_LIB_FILE@%$GNU_TCL_LIB_FILE%g
 s%@MSVC_TCL_LIB_FILE@%$MSVC_TCL_LIB_FILE%g
 s%@TCL_DLL_FILE@%$TCL_DLL_FILE%g
+s%@TCL_DLL_BASE@%$TCL_DLL_BASE%g
 s%@TCL_LIB_FLAG@%$TCL_LIB_FLAG%g
 s%@TCL_BUILD_LIB_SPEC@%$TCL_BUILD_LIB_SPEC%g
 s%@TCL_LIB_SPEC@%$TCL_LIB_SPEC%g
@@ -3007,8 +3007,10 @@ s%@TCL_STUB_LIB_SPEC@%$TCL_STUB_LIB_SPEC%g
 s%@TCL_BUILD_STUB_LIB_PATH@%$TCL_BUILD_STUB_LIB_PATH%g
 s%@TCL_STUB_LIB_PATH@%$TCL_STUB_LIB_PATH%g
 s%@DDE_DLL_FILE@%$DDE_DLL_FILE%g
+s%@DDE_DLL_BASE@%$DDE_DLL_BASE%g
 s%@DDE_LIB_FILE@%$DDE_LIB_FILE%g
 s%@REG_DLL_FILE@%$REG_DLL_FILE%g
+s%@REG_DLL_BASE@%$REG_DLL_BASE%g
 s%@REG_LIB_FILE@%$REG_LIB_FILE%g
 s%@PIPE_DLL_FILE@%$PIPE_DLL_FILE%g
 s%@TCL_SRC_DIR@%$TCL_SRC_DIR%g
diff --git a/tcl/win/configure.in b/tcl/win/configure.in
index 49a0501d25..a43289ebfc 100755
--- a/tcl/win/configure.in
+++ b/tcl/win/configure.in
@@ -183,6 +183,7 @@ AC_SUBST(TCL_LIB_FILE)
 AC_SUBST(GNU_TCL_LIB_FILE)
 AC_SUBST(MSVC_TCL_LIB_FILE)
 AC_SUBST(TCL_DLL_FILE)
+AC_SUBST(TCL_DLL_BASE)
 AC_SUBST(TCL_LIB_FLAG)
 AC_SUBST(TCL_BUILD_LIB_SPEC)
 AC_SUBST(TCL_LIB_SPEC)
@@ -195,8 +196,10 @@ AC_SUBST(TCL_BUILD_STUB_LIB_PATH)
 AC_SUBST(TCL_STUB_LIB_PATH)
 
 AC_SUBST(DDE_DLL_FILE)
+AC_SUBST(DDE_DLL_BASE)
 AC_SUBST(DDE_LIB_FILE)
 AC_SUBST(REG_DLL_FILE)
+AC_SUBST(REG_DLL_BASE)
 AC_SUBST(REG_LIB_FILE)
 AC_SUBST(PIPE_DLL_FILE)
 
diff --git a/tcl/win/tcl.hpj.in b/tcl/win/tcl.hpj.in
new file mode 100644
index 0000000000..3400816b9e
--- /dev/null
+++ b/tcl/win/tcl.hpj.in
@@ -0,0 +1,19 @@
+; This file is maintained by HCW. Do not modify this file directly.
+
+[OPTIONS]
+HCW=0
+LCID=0x409 0x0 0x0 ;English (United States)
+REPORT=Yes
+TITLE=Tcl/Tk Reference Manual
+CNT=tcl83.cnt
+COPYRIGHT=Copyright © 1999 Scriptics Corporation
+HLP=tcl83.hlp
+
+[FILES]
+tcl.rtf
+
+[WINDOWS]
+main="Tcl/Tk Reference Manual",,0
+
+[CONFIG]
+BrowseButtons()
diff --git a/tcl/win/tcl.m4 b/tcl/win/tcl.m4
index d2188de98f..d39e787be6 100644
--- a/tcl/win/tcl.m4
+++ b/tcl/win/tcl.m4
@@ -414,6 +414,9 @@ AC_DEFUN(SC_CONFIG_CFLAGS, [
 	    # Add SHLIB_LD_LIBS to the Make rule, not here.
 	    MAKE_DLL="\${SHLIB_LD} \$(LDFLAGS) -o \[$]@ ${extra_ldflags} \
 	        -Wl,--out-implib,\$(patsubst %.dll,lib%.a,\[$]@)"
+	    TCL_DLL_BASE="-Wl,--image-base=0x66000000"
+	    DDE_DLL_BASE="-Wl,--image-base=0x66100000"
+	    REG_DLL_BASE="-Wl,--image-base=0x66200000"
 
 	    LIBSUFFIX="\${DBGX}.a"
 	    DLLSUFFIX="\${DBGX}.dll"
@@ -433,15 +436,8 @@ AC_DEFUN(SC_CONFIG_CFLAGS, [
 
 	# Specify linker flags depending on the type of app being 
 	# built -- Console vs. Window.
-	#
-	# We need to pass -e _WinMain@16 so that ld will use
-	# WinMain() instead of main() as the entry point. We can't
-	# use autoconf to check for this case since it would need
-	# to run an executable and that does not work when
-	# cross compiling. Remove this -e workaround once we
-	# require a gcc that does not have this bug.
 	LDFLAGS_CONSOLE="-mconsole ${extra_ldflags}"
-	LDFLAGS_WINDOW="-mwindows -e _WinMain@16 ${extra_ldflags}"
+	LDFLAGS_WINDOW="-mwindows ${extra_ldflags}"
     else
 	SHLIB_LD="link -dll -nologo"
 	SHLIB_LD_LIBS="user32.lib advapi32.lib"