diff options
| author | hobbs <hobbs@noemail.net> | 2004-12-30 02:01:41 (GMT) |
|---|---|---|
| committer | hobbs <hobbs@noemail.net> | 2004-12-30 02:01:41 (GMT) |
| commit | 6aa36c96e4d9b65043f792e610d65a23b30a9f0f (patch) | |
| tree | 9e1a860ab4490144fde40c686e748d082016692d /win | |
| parent | 732275e87c6cb9ca9600221eaf90953edaadd497 (diff) | |
| download | tk-6aa36c96e4d9b65043f792e610d65a23b30a9f0f.zip tk-6aa36c96e4d9b65043f792e610d65a23b30a9f0f.tar.gz tk-6aa36c96e4d9b65043f792e610d65a23b30a9f0f.tar.bz2 | |
* win/tcl.m4, win/configure: update MSVC CFLAGS_OPT to -O2, remove
-Gs (included in -O2) and -GD (outdated). Use "link -lib" instead
of "lib" binary and remove -YX for MSVC7 portability. Add
-fomit-frame-pointer for gcc OPT compiles. [Bug 1092952, 1091967]
FossilOrigin-Name: 2a21f2115d59a669f8fc74674670d270790481a8
Diffstat (limited to 'win')
| -rwxr-xr-x | win/configure | 23 | ||||
| -rw-r--r-- | win/tcl.m4 | 18 |
2 files changed, 28 insertions, 13 deletions
diff --git a/win/configure b/win/configure index 391b5f5..4fd7f78 100755 --- a/win/configure +++ b/win/configure @@ -1274,7 +1274,7 @@ SHELL=/bin/sh TK_VERSION=8.5 TK_MAJOR_VERSION=8 TK_MINOR_VERSION=5 -TK_PATCH_LEVEL="a2" +TK_PATCH_LEVEL="a3" VER=$TK_MAJOR_VERSION$TK_MINOR_VERSION #------------------------------------------------------------------------ @@ -2438,6 +2438,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 + else TCL_THREADS=0 echo "$as_me:$LINENO: result: no (default)" >&5 @@ -2684,7 +2690,7 @@ echo "$as_me: error: ${CC} does not support the -shared option. EXTRA_CFLAGS="${extra_cflags}" CFLAGS_DEBUG=-g - CFLAGS_OPTIMIZE=-O + CFLAGS_OPTIMIZE="-O2 -fomit-frame-pointer" CFLAGS_WARNING="-Wall -Wconversion" LDFLAGS_DEBUG= LDFLAGS_OPTIMIZE= @@ -2763,17 +2769,20 @@ echo "$as_me: WARNING: \"could not find 64-bit SDK to enable 64bit mode\"" >&2;} -I${MSSDK}/Include" RC="${MSSDK}/bin/rc.exe" CFLAGS_DEBUG="-nologo -Zi -Od ${runtime}d" - CFLAGS_OPTIMIZE="-nologo -O2 -Gs ${runtime}" + CFLAGS_OPTIMIZE="-nologo -O2 ${runtime}" lflags="-MACHINE:IA64 -LIBPATH:${MSSDK}/Lib/IA64 \ -LIBPATH:${MSSDK}/Lib/Prerelease/IA64" STLIB_LD="${MSSDK}/bin/win64/lib.exe -nologo ${lflags}" LINKBIN="${MSSDK}/bin/win64/link.exe ${lflags}" else RC="rc" + # -Od - no optimization + # -WX - warnings as errors CFLAGS_DEBUG="-nologo -Z7 -Od -WX ${runtime}d" - CFLAGS_OPTIMIZE="-nologo -Oti -Gs -GD ${runtime}" - STLIB_LD="lib -nologo" - LINKBIN="link -link50compat" + # -O2 - create fast code (/Og /Oi /Ot /Oy /Ob2 /Gs /GF /Gy) + CFLAGS_OPTIMIZE="-nologo -O2 ${runtime}" + STLIB_LD="link -lib -nologo" + LINKBIN="link" fi SHLIB_LD="${LINKBIN} -dll -nologo -incremental:no" @@ -2789,7 +2798,7 @@ echo "$as_me: WARNING: \"could not find 64-bit SDK to enable 64bit mode\"" >&2;} MAKE_EXE="\${CC} -Fe\$@" LIBPREFIX="" - EXTRA_CFLAGS="-YX" + EXTRA_CFLAGS="" CFLAGS_WARNING="-W3" LDFLAGS_DEBUG="-debug:full -debugtype:both" LDFLAGS_OPTIMIZE="-release" @@ -257,6 +257,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) else TCL_THREADS=0 AC_MSG_RESULT([no (default)]) @@ -516,7 +519,7 @@ AC_DEFUN(SC_CONFIG_CFLAGS, [ EXTRA_CFLAGS="${extra_cflags}" CFLAGS_DEBUG=-g - CFLAGS_OPTIMIZE=-O + CFLAGS_OPTIMIZE="-O2 -fomit-frame-pointer" CFLAGS_WARNING="-Wall -Wconversion" LDFLAGS_DEBUG= LDFLAGS_OPTIMIZE= @@ -592,17 +595,20 @@ AC_DEFUN(SC_CONFIG_CFLAGS, [ -I${MSSDK}/Include" RC="${MSSDK}/bin/rc.exe" CFLAGS_DEBUG="-nologo -Zi -Od ${runtime}d" - CFLAGS_OPTIMIZE="-nologo -O2 -Gs ${runtime}" + CFLAGS_OPTIMIZE="-nologo -O2 ${runtime}" lflags="-MACHINE:IA64 -LIBPATH:${MSSDK}/Lib/IA64 \ -LIBPATH:${MSSDK}/Lib/Prerelease/IA64" STLIB_LD="${MSSDK}/bin/win64/lib.exe -nologo ${lflags}" LINKBIN="${MSSDK}/bin/win64/link.exe ${lflags}" else RC="rc" + # -Od - no optimization + # -WX - warnings as errors CFLAGS_DEBUG="-nologo -Z7 -Od -WX ${runtime}d" - CFLAGS_OPTIMIZE="-nologo -Oti -Gs -GD ${runtime}" - STLIB_LD="lib -nologo" - LINKBIN="link -link50compat" + # -O2 - create fast code (/Og /Oi /Ot /Oy /Ob2 /Gs /GF /Gy) + CFLAGS_OPTIMIZE="-nologo -O2 ${runtime}" + STLIB_LD="link -lib -nologo" + LINKBIN="link" fi SHLIB_LD="${LINKBIN} -dll -nologo -incremental:no" @@ -618,7 +624,7 @@ AC_DEFUN(SC_CONFIG_CFLAGS, [ MAKE_EXE="\${CC} -Fe\[$]@" LIBPREFIX="" - EXTRA_CFLAGS="-YX" + EXTRA_CFLAGS="" CFLAGS_WARNING="-W3" LDFLAGS_DEBUG="-debug:full -debugtype:both" LDFLAGS_OPTIMIZE="-release" |