Merge 53501 and 53502 from 25 branch:

Add /GS- for AMD64 and Itanium builds where missing.

diff --git a/PCbuild/_bsddb.vcproj b/PCbuild/_bsddb.vcproj
index 4a612a440cee66b6f7fe811d8e6163d8fdfdb0ec..f901d53639737394bf5f6a3ec10d42e8ae2d8edf 100644 (file)
--- a/PCbuild/_bsddb.vcproj
+++ b/PCbuild/_bsddb.vcproj
@@ -130,7 +130,7 @@
                        ATLMinimizesCRunTimeLibraryUsage="FALSE">
                        <Tool
                                Name="VCCLCompilerTool"
-                               AdditionalOptions=" /USECL:MS_ITANIUM"
+                               AdditionalOptions=" /USECL:MS_ITANIUM /GS-"
                                Optimization="2"
                                InlineFunctionExpansion="1"
                                AdditionalIncludeDirectories="..\Include;..\PC;&quot;..\..\db-4.4.20\build_win32&quot;"

diff --git a/PCbuild/_elementtree.vcproj b/PCbuild/_elementtree.vcproj
index dec48e32f6801b8c6177939584663e943ef7cdcd..587a35c1ac356bc8d76273951bef6f6d18fb10f3 100644 (file)
--- a/PCbuild/_elementtree.vcproj
+++ b/PCbuild/_elementtree.vcproj
@@ -129,7 +129,7 @@
                        ATLMinimizesCRunTimeLibraryUsage="FALSE">
                        <Tool
                                Name="VCCLCompilerTool"
-                               AdditionalOptions=" /USECL:MS_ITANIUM"
+                               AdditionalOptions=" /USECL:MS_ITANIUM /GS-"
                                Optimization="2"
                                InlineFunctionExpansion="1"
                                AdditionalIncludeDirectories="..\Include,..\PC,..\Modules\expat"

diff --git a/PCbuild/_msi.vcproj b/PCbuild/_msi.vcproj
index b4afeb4a990482de39fc08be90729f39c974d4e2..cbf20ea1d31fbe095f3422bbd5239d7c20b03dd5 100644 (file)
--- a/PCbuild/_msi.vcproj
+++ b/PCbuild/_msi.vcproj
@@ -129,7 +129,7 @@
                        CharacterSet="2">
                        <Tool
                                Name="VCCLCompilerTool"
-                               AdditionalOptions=" /USECL:MS_ITANIUM"
+                               AdditionalOptions=" /USECL:MS_ITANIUM /GS-"
                                Optimization="2"
                                InlineFunctionExpansion="1"
                                AdditionalIncludeDirectories="..\Include,..\PC"
@@ -150,7 +150,7 @@
                        <Tool
                                Name="VCLinkerTool"
                                AdditionalOptions=" /MACHINE:IA64 /USELINK:MS_SDK"
-                               AdditionalDependencies="fci.lib msi.lib rpcrt4.lib"
+                               AdditionalDependencies="fci.lib msi.lib rpcrt4.lib bufferoverflowU.lib"
                                OutputFile="./_msi.pyd"
                                LinkIncremental="1"
                                SuppressStartupBanner="TRUE"

diff --git a/PCbuild/_socket.vcproj b/PCbuild/_socket.vcproj
index 22fb492c0806ad0a7f45d8e8b7a1c9246735b0cd..26f77efbeef20f788aa379bf124a45e953117521 100644 (file)
--- a/PCbuild/_socket.vcproj
+++ b/PCbuild/_socket.vcproj
@@ -128,7 +128,7 @@
                        ATLMinimizesCRunTimeLibraryUsage="FALSE">
                        <Tool
                                Name="VCCLCompilerTool"
-                               AdditionalOptions=" /USECL:MS_ITANIUM"
+                               AdditionalOptions=" /USECL:MS_ITANIUM /GS-"
                                Optimization="2"
                                InlineFunctionExpansion="1"
                                AdditionalIncludeDirectories="..\Include,..\PC"

diff --git a/PCbuild/_sqlite3.vcproj b/PCbuild/_sqlite3.vcproj
index a0408a61f8940b4911d884f33d171268f1d9ae68..aea397806079c9600072215aca33a705b57a0305 100644 (file)
--- a/PCbuild/_sqlite3.vcproj
+++ b/PCbuild/_sqlite3.vcproj
@@ -131,7 +131,7 @@
                        ATLMinimizesCRunTimeLibraryUsage="FALSE">
                        <Tool
                                Name="VCCLCompilerTool"
-                               AdditionalOptions=" /USECL:MS_ITANIUM"
+                               AdditionalOptions=" /USECL:MS_ITANIUM /GS-"
                                Optimization="2"
                                InlineFunctionExpansion="1"
                                AdditionalIncludeDirectories="..\Include;..\PC;..\..\sqlite-source-3.3.4"
@@ -193,7 +193,7 @@
                        ATLMinimizesCRunTimeLibraryUsage="FALSE">
                        <Tool
                                Name="VCCLCompilerTool"
-                               AdditionalOptions=" /USECL:MS_OPTERON"
+                               AdditionalOptions=" /USECL:MS_OPTERON /GS-"
                                Optimization="2"
                                InlineFunctionExpansion="1"
                                AdditionalIncludeDirectories="..\Include;..\PC;..\..\sqlite-source-3.3.4"

diff --git a/PCbuild/_ssl.mak b/PCbuild/_ssl.mak
index 2623d270cb869d5d3423e0435465045117611a60..5641c6a72db1623869fd1bc5fb36cf5a30202746 100644 (file)
--- a/PCbuild/_ssl.mak
+++ b/PCbuild/_ssl.mak
@@ -31,7 +31,7 @@ _ssl$(SUFFIX): $(SSL_SOURCE) $(SSL_LIB_DIR)/libeay32.lib $(SSL_LIB_DIR)/ssleay32
 
 _hashlib$(SUFFIX): $(HASH_SOURCE) $(SSL_LIB_DIR)/libeay32.lib ../PC/*.h ../Include/*.h
     @if not exist "$(TEMP)/_hashlib/." mkdir "$(TEMP)/_hashlib"
-    cl /nologo /c $(HASH_SOURCE) $(CFLAGS) /Fo$(TEMP)\_hashlib\$*.obj $(INCLUDES) 
+    cl /nologo /c $(HASH_SOURCE) $(CFLAGS) $(EXTRA_CFLAGS) /Fo$(TEMP)\_hashlib\$*.obj $(INCLUDES) 
     link /nologo @<<
        /dll /out:_hashlib$(SUFFIX) $(HASH_LIBS) $(TEMP)\_hashlib\$*.obj
 <<

diff --git a/PCbuild/_testcapi.vcproj b/PCbuild/_testcapi.vcproj
index c58331e97d7ca865a2bb6dcb5cde6030bee5e797..a91d8ce16ea01998a979b9ba8e1c614af8862c2c 100644 (file)
--- a/PCbuild/_testcapi.vcproj
+++ b/PCbuild/_testcapi.vcproj
@@ -126,7 +126,7 @@
                        CharacterSet="2">
                        <Tool
                                Name="VCCLCompilerTool"
-                               AdditionalOptions=" /USECL:MS_ITANIUM"
+                               AdditionalOptions=" /USECL:MS_ITANIUM /GS-"
                                Optimization="2"
                                InlineFunctionExpansion="1"
                                AdditionalIncludeDirectories="..\Include,..\PC"

diff --git a/PCbuild/_tkinter.vcproj b/PCbuild/_tkinter.vcproj
index 4ffeae5a46c57a9a9d98cdb8619cef38b0bafd12..f14e7277984b5aea9585d63b42fa4f51babc220a 100644 (file)
--- a/PCbuild/_tkinter.vcproj
+++ b/PCbuild/_tkinter.vcproj
@@ -130,7 +130,7 @@
                        ATLMinimizesCRunTimeLibraryUsage="FALSE">
                        <Tool
                                Name="VCCLCompilerTool"
-                               AdditionalOptions=" /USECL:MS_ITANIUM"
+                               AdditionalOptions=" /USECL:MS_ITANIUM /GS-"
                                Optimization="2"
                                InlineFunctionExpansion="1"
                                AdditionalIncludeDirectories="..\..\tcltk\include,..\Include,..\PC"

diff --git a/PCbuild/build_ssl.py b/PCbuild/build_ssl.py
index 5ab34498a846248d3dff1bf43b8127780e65107b..2a31ca4679f2dcbd5a92612aff692969c3a867f5 100644 (file)
--- a/PCbuild/build_ssl.py
+++ b/PCbuild/build_ssl.py
@@ -169,6 +169,8 @@ def main():
     defs = "SSL_DIR=\"%s\"" % (ssl_dir,)
     if debug:
         defs = defs + " " + "DEBUG=1"
+    if arch in ('amd64', 'ia64'):
+        defs = defs + " EXTRA_CFLAGS=/GS-"
     makeCommand = 'nmake /nologo -f _ssl.mak ' + defs + " " + make_flags
     print "Executing:", makeCommand
     sys.stdout.flush()

diff --git a/PCbuild/bz2.vcproj b/PCbuild/bz2.vcproj
index 8cbe15a3cf98716210100c327901c5f52586d0ca..d86d325b43e55f17a78a3a8632ab0256021eaa23 100644 (file)
--- a/PCbuild/bz2.vcproj
+++ b/PCbuild/bz2.vcproj
@@ -137,7 +137,7 @@ nmake /nologo /f makefile.msc lib
                        ATLMinimizesCRunTimeLibraryUsage="FALSE">
                        <Tool
                                Name="VCCLCompilerTool"
-                               AdditionalOptions=" /USECL:MS_ITANIUM"
+                               AdditionalOptions=" /USECL:MS_ITANIUM /GS-"
                                Optimization="2"
                                InlineFunctionExpansion="1"
                                AdditionalIncludeDirectories="..\Include,..\PC,..\..\bzip2-1.0.3"

diff --git a/PCbuild/pyexpat.vcproj b/PCbuild/pyexpat.vcproj
index c2b88244e9354085abab2d00a26889a72624d979..1c5b3ad306caa0a2c1aaa7a487646146c23f63ad 100644 (file)
--- a/PCbuild/pyexpat.vcproj
+++ b/PCbuild/pyexpat.vcproj
@@ -128,7 +128,7 @@
                        ATLMinimizesCRunTimeLibraryUsage="FALSE">
                        <Tool
                                Name="VCCLCompilerTool"
-                               AdditionalOptions=" /USECL:MS_ITANIUM"
+                               AdditionalOptions=" /USECL:MS_ITANIUM /GS-"
                                Optimization="2"
                                InlineFunctionExpansion="1"
                                AdditionalIncludeDirectories="..\Include,..\PC,..\Modules\expat"
@@ -189,7 +189,7 @@
                        ATLMinimizesCRunTimeLibraryUsage="FALSE">
                        <Tool
                                Name="VCCLCompilerTool"
-                               AdditionalOptions=" /USECL:MS_OPTERON"
+                               AdditionalOptions=" /USECL:MS_OPTERON  /GS-"
                                Optimization="2"
                                InlineFunctionExpansion="1"
                                AdditionalIncludeDirectories="..\Include,..\PC,..\Modules\expat"

diff --git a/PCbuild/python.vcproj b/PCbuild/python.vcproj
index aa432d4241957713e30402c8fa9d969f43ecd158..8412e810de4d275fd523d086791159b29ac92276 100644 (file)
--- a/PCbuild/python.vcproj
+++ b/PCbuild/python.vcproj
@@ -137,7 +137,7 @@
                        CharacterSet="2">
                        <Tool
                                Name="VCCLCompilerTool"
-                               AdditionalOptions=" /USECL:MS_ITANIUM /VSEXTCOMP_VERBOSE"
+                               AdditionalOptions=" /USECL:MS_ITANIUM  /GS-"
                                Optimization="2"
                                InlineFunctionExpansion="1"
                                AdditionalIncludeDirectories="..\Include,..\PC"

diff --git a/PCbuild/pythoncore.vcproj b/PCbuild/pythoncore.vcproj
index ebaa78f7cf6a423d74354ccbef07ec2d05c3056e..9f59cf42e3eb61b29e05889ea179d5ad5eccdc7d 100644 (file)
--- a/PCbuild/pythoncore.vcproj
+++ b/PCbuild/pythoncore.vcproj
@@ -144,7 +144,7 @@
                        ATLMinimizesCRunTimeLibraryUsage="FALSE">
                        <Tool
                                Name="VCCLCompilerTool"
-                               AdditionalOptions=" /USECL:MS_ITANIUM"
+                               AdditionalOptions=" /USECL:MS_ITANIUM /GS-"
                                Optimization="2"
                                InlineFunctionExpansion="1"
                                AdditionalIncludeDirectories="..\Include,..\PC"

diff --git a/PCbuild/pythonw.vcproj b/PCbuild/pythonw.vcproj
index 2cc7d615356e612c2a9fe175e0af9c2d681ea7ba..d00142fa1cb85d9baa386aca385780e539c86d16 100644 (file)
--- a/PCbuild/pythonw.vcproj
+++ b/PCbuild/pythonw.vcproj
@@ -130,7 +130,7 @@
                        ATLMinimizesCRunTimeLibraryUsage="FALSE">
                        <Tool
                                Name="VCCLCompilerTool"
-                               AdditionalOptions=" /USECL:MS_ITANIUM"
+                               AdditionalOptions=" /USECL:MS_ITANIUM /GS-"
                                Optimization="2"
                                InlineFunctionExpansion="1"
                                AdditionalIncludeDirectories="..\Include,..\PC"

diff --git a/PCbuild/select.vcproj b/PCbuild/select.vcproj
index 15bfe17808c58b5430fea99c2d45108e62d0c70d..615cc0f22079f286c4215e7d27871c19b346295b 100644 (file)
--- a/PCbuild/select.vcproj
+++ b/PCbuild/select.vcproj
@@ -130,7 +130,7 @@
                        ATLMinimizesCRunTimeLibraryUsage="FALSE">
                        <Tool
                                Name="VCCLCompilerTool"
-                               AdditionalOptions=" /USECL:MS_ITANIUM"
+                               AdditionalOptions=" /USECL:MS_ITANIUM /GS-"
                                Optimization="2"
                                InlineFunctionExpansion="1"
                                AdditionalIncludeDirectories="..\Include,..\PC"

diff --git a/PCbuild/unicodedata.vcproj b/PCbuild/unicodedata.vcproj
index 472b6b7e31aa784308fbca64815b7609a3f40c35..cc23da1764175575bb7bbfe63a46b44af4c71d55 100644 (file)
--- a/PCbuild/unicodedata.vcproj
+++ b/PCbuild/unicodedata.vcproj
@@ -126,7 +126,7 @@
                        CharacterSet="2">
                        <Tool
                                Name="VCCLCompilerTool"
-                               AdditionalOptions=" /USECL:MS_ITANIUM"
+                               AdditionalOptions=" /USECL:MS_ITANIUM /GS-"
                                Optimization="2"
                                InlineFunctionExpansion="1"
                                AdditionalIncludeDirectories="..\Include,..\PC"

diff --git a/PCbuild/winsound.vcproj b/PCbuild/winsound.vcproj
index 34aadbf18a2c9db97a91f89fa2706ec2a41a06dc..6736ad7958c12b21d2f88218e7aedfbb966c0f0a 100644 (file)
--- a/PCbuild/winsound.vcproj
+++ b/PCbuild/winsound.vcproj
@@ -128,7 +128,7 @@
                        CharacterSet="2">
                        <Tool
                                Name="VCCLCompilerTool"
-                               AdditionalOptions=" /USECL:MS_ITANIUM"
+                               AdditionalOptions=" /USECL:MS_ITANIUM /GS-"
                                Optimization="2"
                                InlineFunctionExpansion="1"
                                AdditionalIncludeDirectories="..\Include,..\PC"