merge trunk

5 files changed, 36 insertions, 23 deletions

diff --git a/win/configure b/win/configure
index 73d6d9f..147252c 100755
--- a/win/configure
+++ b/win/configure
@@ -4165,7 +4165,7 @@ $as_echo "using shared flags" >&6; }
 
 	CFLAGS_DEBUG=-g
 	CFLAGS_OPTIMIZE="-O2 -fomit-frame-pointer"
-	CFLAGS_WARNING="-Wall -Wsign-compare -Wdeclaration-after-statement"
+	CFLAGS_WARNING="-Wall -Wwrite-strings -Wsign-compare -Wdeclaration-after-statement"
 	LDFLAGS_DEBUG=
 	LDFLAGS_OPTIMIZE=
 
diff --git a/win/nmakehlp.c b/win/nmakehlp.c
index 84cf75c..22b7b06 100644
--- a/win/nmakehlp.c
+++ b/win/nmakehlp.c
@@ -43,7 +43,7 @@
 /* protos */
 
 static int CheckForCompilerFeature(const char *option);
-static int CheckForLinkerFeature(const char *option);
+static int CheckForLinkerFeature(const char **options, int count);
 static int IsIn(const char *string, const char *substring);
 static int SubstituteFile(const char *substs, const char *filename);
 static int QualifyPath(const char *path);
@@ -102,16 +102,16 @@ main(
 	    }
 	    return CheckForCompilerFeature(argv[2]);
 	case 'l':
-	    if (argc != 3) {
+	    if (argc < 3) {
 		chars = snprintf(msg, sizeof(msg) - 1,
-	       		"usage: %s -l <linker option>\n"
+	       		"usage: %s -l <linker option> ?<mandatory option> ...?\n"
 			"Tests for whether link.exe supports an option\n"
 			"exitcodes: 0 == no, 1 == yes, 2 == error\n", argv[0]);
 		WriteFile(GetStdHandle(STD_ERROR_HANDLE), msg, chars,
 			&dwWritten, NULL);
 		return 2;
 	    }
-	    return CheckForLinkerFeature(argv[2]);
+	    return CheckForLinkerFeature(&argv[2], argc-2);
 	case 'f':
 	    if (argc == 2) {
 		chars = snprintf(msg, sizeof(msg) - 1,
@@ -313,7 +313,8 @@ CheckForCompilerFeature(
 
 static int
 CheckForLinkerFeature(
-    const char *option)
+    const char **options,
+    int count)
 {
     STARTUPINFO si;
     PROCESS_INFORMATION pi;
@@ -322,7 +323,8 @@ CheckForLinkerFeature(
     char msg[300];
     BOOL ok;
     HANDLE hProcess, h, pipeThreads[2];
-    char cmdline[100];
+    int i;
+    char cmdline[255];
 
     hProcess = GetCurrentProcess();
 
@@ -368,7 +370,11 @@ CheckForLinkerFeature(
      * Append our option for testing.
      */
 
-    lstrcat(cmdline, option);
+    for (i = 0; i < count; i++) {
+	lstrcat(cmdline, " \"");
+	lstrcat(cmdline, options[i]);
+	lstrcat(cmdline, "\"");
+    }
 
     ok = CreateProcess(
 	    NULL,	    /* Module name. */
@@ -433,7 +439,9 @@ CheckForLinkerFeature(
     return !(strstr(Out.buffer, "LNK1117") != NULL ||
 	    strstr(Err.buffer, "LNK1117") != NULL ||
 	    strstr(Out.buffer, "LNK4044") != NULL ||
-	    strstr(Err.buffer, "LNK4044") != NULL);
+	    strstr(Err.buffer, "LNK4044") != NULL ||
+	    strstr(Out.buffer, "LNK4224") != NULL ||
+	    strstr(Err.buffer, "LNK4224") != NULL);
 }
 
 static DWORD WINAPI
diff --git a/win/rules.vc b/win/rules.vc
index e12854d..4a3ae26 100644
--- a/win/rules.vc
+++ b/win/rules.vc
@@ -188,9 +188,14 @@ COMPILERFLAGS   = $(COMPILERFLAGS) -QIA64_Bx
 !endif

 !endif

 

+# Prevents "LNK1561: entry point must be defined" error compiling from VS-IDE:

+!ifndef LINKER_TESTFLAGS

+LINKER_TESTFLAGS = /DLL /NOENTRY /OUT:nmhlp-out.txt

+!endif

+

 !if "$(MACHINE)" == "IX86"

 ### test for -align:4096, when align:512 will do.

-!if [nmakehlp -l -opt:nowin98]

+!if [nmakehlp -l -opt:nowin98 $(LINKER_TESTFLAGS)]

 !message *** Linker has 'Win98 alignment problem'

 ALIGN98_HACK	= 1

 !else

@@ -203,7 +208,7 @@ ALIGN98_HACK	= 0
 

 LINKERFLAGS     =

 

-!if [nmakehlp -l -ltcg]

+!if [nmakehlp -l -ltcg $(LINKER_TESTFLAGS)]

 LINKERFLAGS     =-ltcg

 !endif

 

@@ -417,7 +422,7 @@ TCL_NO_DEPRECATED	    = 0
 !if [nmakehlp -f $(CHECKS) "fullwarn"]

 !message *** Doing full warnings check

 WARNINGS		    = -W4

-!if [nmakehlp -l -warn:3]

+!if [nmakehlp -l -warn:3 $(LINKER_TESTFLAGS)]

 LINKERFLAGS		    = $(LINKERFLAGS) -warn:3

 !endif

 !else

@@ -430,7 +435,7 @@ WARNINGS		    = $(WARNINGS) -Wp64
 !endif

 

 !if $(PGO) > 1

-!if [nmakehlp -l -ltcg:pgoptimize]

+!if [nmakehlp -l -ltcg:pgoptimize $(LINKER_TESTFLAGS)]

 LINKERFLAGS	= $(LINKERFLAGS:-ltcg=) -ltcg:pgoptimize

 !else

 MSG=^

@@ -438,7 +443,7 @@ This compiler does not support profile guided optimization.
 !error $(MSG)

 !endif

 !elseif $(PGO) > 0

-!if [nmakehlp -l -ltcg:pginstrument]

+!if [nmakehlp -l -ltcg:pginstrument $(LINKER_TESTFLAGS)]

 LINKERFLAGS	= $(LINKERFLAGS:-ltcg=) -ltcg:pginstrument

 !else

 MSG=^

diff --git a/win/tcl.dsp b/win/tcl.dsp
index 9ea990b..cade8a7 100644
--- a/win/tcl.dsp
+++ b/win/tcl.dsp
@@ -36,7 +36,7 @@ CFG=tcl - Win32 Debug Static
 # PROP BASE Intermediate_Dir "Release\tcl_Dynamic"

 # PROP BASE Cmd_Line "nmake -nologo -f makefile.vc OPTS=none MSVCDIR=IDE"

 # PROP BASE Rebuild_Opt "-a"

-# PROP BASE Target_File "Release\tclsh85.exe"

+# PROP BASE Target_File "Release\tclsh87.exe"

 # PROP BASE Bsc_Name ""

 # PROP BASE Target_Dir ""

 # PROP Use_MFC 0

@@ -45,7 +45,7 @@ CFG=tcl - Win32 Debug Static
 # PROP Intermediate_Dir "Release\tcl_Dynamic"

 # PROP Cmd_Line "nmake -nologo -f makefile.vc OPTS=threads MSVCDIR=IDE"

 # PROP Rebuild_Opt "clean release"

-# PROP Target_File "Release\tclsh85t.exe"

+# PROP Target_File "Release\tclsh87t.exe"

 # PROP Bsc_Name ""

 # PROP Target_Dir ""

 

@@ -57,7 +57,7 @@ CFG=tcl - Win32 Debug Static
 # PROP BASE Intermediate_Dir "Debug\tcl_Dynamic"

 # PROP BASE Cmd_Line "nmake -nologo -f makefile.vc OPTS=symbols MSVCDIR=IDE"

 # PROP BASE Rebuild_Opt "-a"

-# PROP BASE Target_File "Debug\tclsh85g.exe"

+# PROP BASE Target_File "Debug\tclsh87g.exe"

 # PROP BASE Bsc_Name ""

 # PROP BASE Target_Dir ""

 # PROP Use_MFC 0

@@ -66,7 +66,7 @@ CFG=tcl - Win32 Debug Static
 # PROP Intermediate_Dir "Debug\tcl_Dynamic"

 # PROP Cmd_Line "nmake -nologo -f makefile.vc OPTS=threads,symbols MSVCDIR=IDE"

 # PROP Rebuild_Opt "clean release"

-# PROP Target_File "Debug\tclsh85tg.exe"

+# PROP Target_File "Debug\tclsh87tg.exe"

 # PROP Bsc_Name ""

 # PROP Target_Dir ""

 

@@ -78,7 +78,7 @@ CFG=tcl - Win32 Debug Static
 # PROP BASE Intermediate_Dir "Debug\tcl_Static"

 # PROP BASE Cmd_Line "nmake -nologo -f makefile.vc OPTS=symbols,static MSVCDIR=IDE"

 # PROP BASE Rebuild_Opt "-a"

-# PROP BASE Target_File "Debug\tclsh85sg.exe"

+# PROP BASE Target_File "Debug\tclsh87sg.exe"

 # PROP BASE Bsc_Name ""

 # PROP BASE Target_Dir ""

 # PROP Use_MFC 0

@@ -87,7 +87,7 @@ CFG=tcl - Win32 Debug Static
 # PROP Intermediate_Dir "Debug\tcl_Static"

 # PROP Cmd_Line "nmake -nologo -f makefile.vc OPTS=symbols,static MSVCDIR=IDE"

 # PROP Rebuild_Opt "-a"

-# PROP Target_File "Debug\tclsh85sg.exe"

+# PROP Target_File "Debug\tclsh87sg.exe"

 # PROP Bsc_Name ""

 # PROP Target_Dir ""

 

@@ -99,7 +99,7 @@ CFG=tcl - Win32 Debug Static
 # PROP BASE Intermediate_Dir "Release\tcl_Static"

 # PROP BASE Cmd_Line "nmake -nologo -f makefile.vc OPTS=static MSVCDIR=IDE"

 # PROP BASE Rebuild_Opt "-a"

-# PROP BASE Target_File "Release\tclsh85s.exe"

+# PROP BASE Target_File "Release\tclsh87s.exe"

 # PROP BASE Bsc_Name ""

 # PROP BASE Target_Dir ""

 # PROP Use_MFC 0

@@ -108,7 +108,7 @@ CFG=tcl - Win32 Debug Static
 # PROP Intermediate_Dir "Release\tcl_Static"

 # PROP Cmd_Line "nmake -nologo -f makefile.vc OPTS=static MSVCDIR=IDE"

 # PROP Rebuild_Opt "-a"

-# PROP Target_File "Release\tclsh85s.exe"

+# PROP Target_File "Release\tclsh87s.exe"

 # PROP Bsc_Name ""

 # PROP Target_Dir ""

 

diff --git a/win/tcl.m4 b/win/tcl.m4
index 7eff8e8..b4fbcce 100644
--- a/win/tcl.m4
+++ b/win/tcl.m4
@@ -727,7 +727,7 @@ AC_DEFUN([SC_CONFIG_CFLAGS], [
 
 	CFLAGS_DEBUG=-g
 	CFLAGS_OPTIMIZE="-O2 -fomit-frame-pointer"
-	CFLAGS_WARNING="-Wall -Wsign-compare -Wdeclaration-after-statement"
+	CFLAGS_WARNING="-Wall -Wwrite-strings -Wsign-compare -Wdeclaration-after-statement"
 	LDFLAGS_DEBUG=
 	LDFLAGS_OPTIMIZE=