Skip to content

C
cpython
Commit cc0eba9d authored by Martin v. Löwis's avatar Martin v. Löwis
Browse files
Options

Merge 53501 and 53502 from 25 branch: 

Add /GS- for AMD64 and Itanium builds where missing.
parent 1b0ce852
Hide whitespace changes
Inline Side-by-side
Showing with 21 additions and 19 deletions
PCbuild/_bsddb.vcproj
View file @ cc0eba9d
...@@ -130,7 +130,7 @@ ...@@ -130,7 +130,7 @@
ATLMinimizesCRunTimeLibraryUsage="FALSE"> ATLMinimizesCRunTimeLibraryUsage="FALSE">
<Tool <Tool
Name="VCCLCompilerTool" Name="VCCLCompilerTool"
AdditionalOptions=" /USECL:MS_ITANIUM" AdditionalOptions=" /USECL:MS_ITANIUM /GS-"
Optimization="2" Optimization="2"
InlineFunctionExpansion="1" InlineFunctionExpansion="1"
AdditionalIncludeDirectories="..\Include;..\PC;&quot;..\..\db-4.4.20\build_win32&quot;" AdditionalIncludeDirectories="..\Include;..\PC;&quot;..\..\db-4.4.20\build_win32&quot;"
......
PCbuild/_elementtree.vcproj
View file @ cc0eba9d
...@@ -129,7 +129,7 @@ ...@@ -129,7 +129,7 @@
ATLMinimizesCRunTimeLibraryUsage="FALSE"> ATLMinimizesCRunTimeLibraryUsage="FALSE">
<Tool <Tool
Name="VCCLCompilerTool" Name="VCCLCompilerTool"
AdditionalOptions=" /USECL:MS_ITANIUM" AdditionalOptions=" /USECL:MS_ITANIUM /GS-"
Optimization="2" Optimization="2"
InlineFunctionExpansion="1" InlineFunctionExpansion="1"
AdditionalIncludeDirectories="..\Include,..\PC,..\Modules\expat" AdditionalIncludeDirectories="..\Include,..\PC,..\Modules\expat"
......
PCbuild/_msi.vcproj
View file @ cc0eba9d
...@@ -129,7 +129,7 @@ ...@@ -129,7 +129,7 @@
CharacterSet="2"> CharacterSet="2">
<Tool <Tool
Name="VCCLCompilerTool" Name="VCCLCompilerTool"
AdditionalOptions=" /USECL:MS_ITANIUM" AdditionalOptions=" /USECL:MS_ITANIUM /GS-"
Optimization="2" Optimization="2"
InlineFunctionExpansion="1" InlineFunctionExpansion="1"
AdditionalIncludeDirectories="..\Include,..\PC" AdditionalIncludeDirectories="..\Include,..\PC"
...@@ -150,7 +150,7 @@ ...@@ -150,7 +150,7 @@
<Tool <Tool
Name="VCLinkerTool" Name="VCLinkerTool"
AdditionalOptions=" /MACHINE:IA64 /USELINK:MS_SDK" 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" OutputFile="./_msi.pyd"
LinkIncremental="1" LinkIncremental="1"
SuppressStartupBanner="TRUE" SuppressStartupBanner="TRUE"
......
PCbuild/_socket.vcproj
View file @ cc0eba9d
...@@ -128,7 +128,7 @@ ...@@ -128,7 +128,7 @@
ATLMinimizesCRunTimeLibraryUsage="FALSE"> ATLMinimizesCRunTimeLibraryUsage="FALSE">
<Tool <Tool
Name="VCCLCompilerTool" Name="VCCLCompilerTool"
AdditionalOptions=" /USECL:MS_ITANIUM" AdditionalOptions=" /USECL:MS_ITANIUM /GS-"
Optimization="2" Optimization="2"
InlineFunctionExpansion="1" InlineFunctionExpansion="1"
AdditionalIncludeDirectories="..\Include,..\PC" AdditionalIncludeDirectories="..\Include,..\PC"
......
PCbuild/_sqlite3.vcproj
View file @ cc0eba9d
...@@ -131,7 +131,7 @@ ...@@ -131,7 +131,7 @@
ATLMinimizesCRunTimeLibraryUsage="FALSE"> ATLMinimizesCRunTimeLibraryUsage="FALSE">
<Tool <Tool
Name="VCCLCompilerTool" Name="VCCLCompilerTool"
AdditionalOptions=" /USECL:MS_ITANIUM" AdditionalOptions=" /USECL:MS_ITANIUM /GS-"
Optimization="2" Optimization="2"
InlineFunctionExpansion="1" InlineFunctionExpansion="1"
AdditionalIncludeDirectories="..\Include;..\PC;..\..\sqlite-source-3.3.4" AdditionalIncludeDirectories="..\Include;..\PC;..\..\sqlite-source-3.3.4"
...@@ -193,7 +193,7 @@ ...@@ -193,7 +193,7 @@
ATLMinimizesCRunTimeLibraryUsage="FALSE"> ATLMinimizesCRunTimeLibraryUsage="FALSE">
<Tool <Tool
Name="VCCLCompilerTool" Name="VCCLCompilerTool"
AdditionalOptions=" /USECL:MS_OPTERON" AdditionalOptions=" /USECL:MS_OPTERON /GS-"
Optimization="2" Optimization="2"
InlineFunctionExpansion="1" InlineFunctionExpansion="1"
AdditionalIncludeDirectories="..\Include;..\PC;..\..\sqlite-source-3.3.4" AdditionalIncludeDirectories="..\Include;..\PC;..\..\sqlite-source-3.3.4"
......
PCbuild/_ssl.mak
View file @ cc0eba9d
...@@ -31,7 +31,7 @@ _ssl$(SUFFIX): $(SSL_SOURCE) $(SSL_LIB_DIR)/libeay32.lib $(SSL_LIB_DIR)/ssleay32 ...@@ -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 _hashlib$(SUFFIX): $(HASH_SOURCE) $(SSL_LIB_DIR)/libeay32.lib ../PC/*.h ../Include/*.h
@if not exist "$(TEMP)/_hashlib/." mkdir "$(TEMP)/_hashlib" @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 @<< link /nologo @<<
/dll /out:_hashlib$(SUFFIX) $(HASH_LIBS) $(TEMP)\_hashlib\$*.obj /dll /out:_hashlib$(SUFFIX) $(HASH_LIBS) $(TEMP)\_hashlib\$*.obj
<< <<
PCbuild/_testcapi.vcproj
View file @ cc0eba9d
...@@ -126,7 +126,7 @@ ...@@ -126,7 +126,7 @@
CharacterSet="2"> CharacterSet="2">
<Tool <Tool
Name="VCCLCompilerTool" Name="VCCLCompilerTool"
AdditionalOptions=" /USECL:MS_ITANIUM" AdditionalOptions=" /USECL:MS_ITANIUM /GS-"
Optimization="2" Optimization="2"
InlineFunctionExpansion="1" InlineFunctionExpansion="1"
AdditionalIncludeDirectories="..\Include,..\PC" AdditionalIncludeDirectories="..\Include,..\PC"
......
PCbuild/_tkinter.vcproj
View file @ cc0eba9d
...@@ -130,7 +130,7 @@ ...@@ -130,7 +130,7 @@
ATLMinimizesCRunTimeLibraryUsage="FALSE"> ATLMinimizesCRunTimeLibraryUsage="FALSE">
<Tool <Tool
Name="VCCLCompilerTool" Name="VCCLCompilerTool"
AdditionalOptions=" /USECL:MS_ITANIUM" AdditionalOptions=" /USECL:MS_ITANIUM /GS-"
Optimization="2" Optimization="2"
InlineFunctionExpansion="1" InlineFunctionExpansion="1"
AdditionalIncludeDirectories="..\..\tcltk\include,..\Include,..\PC" AdditionalIncludeDirectories="..\..\tcltk\include,..\Include,..\PC"
......
PCbuild/build_ssl.py
View file @ cc0eba9d
...@@ -169,6 +169,8 @@ def main(): ...@@ -169,6 +169,8 @@ def main():
defs = "SSL_DIR=\"%s\"" % (ssl_dir,) defs = "SSL_DIR=\"%s\"" % (ssl_dir,)
if debug: if debug:
defs = defs + " " + "DEBUG=1" defs = defs + " " + "DEBUG=1"
if arch in ('amd64', 'ia64'):
defs = defs + " EXTRA_CFLAGS=/GS-"
makeCommand = 'nmake /nologo -f _ssl.mak ' + defs + " " + make_flags makeCommand = 'nmake /nologo -f _ssl.mak ' + defs + " " + make_flags
print "Executing:", makeCommand print "Executing:", makeCommand
sys.stdout.flush() sys.stdout.flush()
......
PCbuild/bz2.vcproj
View file @ cc0eba9d
...@@ -137,7 +137,7 @@ nmake /nologo /f makefile.msc lib ...@@ -137,7 +137,7 @@ nmake /nologo /f makefile.msc lib
ATLMinimizesCRunTimeLibraryUsage="FALSE"> ATLMinimizesCRunTimeLibraryUsage="FALSE">
<Tool <Tool
Name="VCCLCompilerTool" Name="VCCLCompilerTool"
AdditionalOptions=" /USECL:MS_ITANIUM" AdditionalOptions=" /USECL:MS_ITANIUM /GS-"
Optimization="2" Optimization="2"
InlineFunctionExpansion="1" InlineFunctionExpansion="1"
AdditionalIncludeDirectories="..\Include,..\PC,..\..\bzip2-1.0.3" AdditionalIncludeDirectories="..\Include,..\PC,..\..\bzip2-1.0.3"
......
PCbuild/pyexpat.vcproj
View file @ cc0eba9d
...@@ -128,7 +128,7 @@ ...@@ -128,7 +128,7 @@
ATLMinimizesCRunTimeLibraryUsage="FALSE"> ATLMinimizesCRunTimeLibraryUsage="FALSE">
<Tool <Tool
Name="VCCLCompilerTool" Name="VCCLCompilerTool"
AdditionalOptions=" /USECL:MS_ITANIUM" AdditionalOptions=" /USECL:MS_ITANIUM /GS-"
Optimization="2" Optimization="2"
InlineFunctionExpansion="1" InlineFunctionExpansion="1"
AdditionalIncludeDirectories="..\Include,..\PC,..\Modules\expat" AdditionalIncludeDirectories="..\Include,..\PC,..\Modules\expat"
...@@ -189,7 +189,7 @@ ...@@ -189,7 +189,7 @@
ATLMinimizesCRunTimeLibraryUsage="FALSE"> ATLMinimizesCRunTimeLibraryUsage="FALSE">
<Tool <Tool
Name="VCCLCompilerTool" Name="VCCLCompilerTool"
AdditionalOptions=" /USECL:MS_OPTERON" AdditionalOptions=" /USECL:MS_OPTERON /GS-"
Optimization="2" Optimization="2"
InlineFunctionExpansion="1" InlineFunctionExpansion="1"
AdditionalIncludeDirectories="..\Include,..\PC,..\Modules\expat" AdditionalIncludeDirectories="..\Include,..\PC,..\Modules\expat"
......
PCbuild/python.vcproj
View file @ cc0eba9d
...@@ -137,7 +137,7 @@ ...@@ -137,7 +137,7 @@
CharacterSet="2"> CharacterSet="2">
<Tool <Tool
Name="VCCLCompilerTool" Name="VCCLCompilerTool"
AdditionalOptions=" /USECL:MS_ITANIUM /VSEXTCOMP_VERBOSE" AdditionalOptions=" /USECL:MS_ITANIUM /GS-"
Optimization="2" Optimization="2"
InlineFunctionExpansion="1" InlineFunctionExpansion="1"
AdditionalIncludeDirectories="..\Include,..\PC" AdditionalIncludeDirectories="..\Include,..\PC"
......
PCbuild/pythoncore.vcproj
View file @ cc0eba9d
...@@ -144,7 +144,7 @@ ...@@ -144,7 +144,7 @@
ATLMinimizesCRunTimeLibraryUsage="FALSE"> ATLMinimizesCRunTimeLibraryUsage="FALSE">
<Tool <Tool
Name="VCCLCompilerTool" Name="VCCLCompilerTool"
AdditionalOptions=" /USECL:MS_ITANIUM" AdditionalOptions=" /USECL:MS_ITANIUM /GS-"
Optimization="2" Optimization="2"
InlineFunctionExpansion="1" InlineFunctionExpansion="1"
AdditionalIncludeDirectories="..\Include,..\PC" AdditionalIncludeDirectories="..\Include,..\PC"
......
PCbuild/pythonw.vcproj
View file @ cc0eba9d
...@@ -130,7 +130,7 @@ ...@@ -130,7 +130,7 @@
ATLMinimizesCRunTimeLibraryUsage="FALSE"> ATLMinimizesCRunTimeLibraryUsage="FALSE">
<Tool <Tool
Name="VCCLCompilerTool" Name="VCCLCompilerTool"
AdditionalOptions=" /USECL:MS_ITANIUM" AdditionalOptions=" /USECL:MS_ITANIUM /GS-"
Optimization="2" Optimization="2"
InlineFunctionExpansion="1" InlineFunctionExpansion="1"
AdditionalIncludeDirectories="..\Include,..\PC" AdditionalIncludeDirectories="..\Include,..\PC"
......
PCbuild/select.vcproj
View file @ cc0eba9d
...@@ -130,7 +130,7 @@ ...@@ -130,7 +130,7 @@
ATLMinimizesCRunTimeLibraryUsage="FALSE"> ATLMinimizesCRunTimeLibraryUsage="FALSE">
<Tool <Tool
Name="VCCLCompilerTool" Name="VCCLCompilerTool"
AdditionalOptions=" /USECL:MS_ITANIUM" AdditionalOptions=" /USECL:MS_ITANIUM /GS-"
Optimization="2" Optimization="2"
InlineFunctionExpansion="1" InlineFunctionExpansion="1"
AdditionalIncludeDirectories="..\Include,..\PC" AdditionalIncludeDirectories="..\Include,..\PC"
......
PCbuild/unicodedata.vcproj
View file @ cc0eba9d
...@@ -126,7 +126,7 @@ ...@@ -126,7 +126,7 @@
CharacterSet="2"> CharacterSet="2">
<Tool <Tool
Name="VCCLCompilerTool" Name="VCCLCompilerTool"
AdditionalOptions=" /USECL:MS_ITANIUM" AdditionalOptions=" /USECL:MS_ITANIUM /GS-"
Optimization="2" Optimization="2"
InlineFunctionExpansion="1" InlineFunctionExpansion="1"
AdditionalIncludeDirectories="..\Include,..\PC" AdditionalIncludeDirectories="..\Include,..\PC"
......
PCbuild/winsound.vcproj
View file @ cc0eba9d
...@@ -128,7 +128,7 @@ ...@@ -128,7 +128,7 @@
CharacterSet="2"> CharacterSet="2">
<Tool <Tool
Name="VCCLCompilerTool" Name="VCCLCompilerTool"
AdditionalOptions=" /USECL:MS_ITANIUM" AdditionalOptions=" /USECL:MS_ITANIUM /GS-"
Optimization="2" Optimization="2"
InlineFunctionExpansion="1" InlineFunctionExpansion="1"
AdditionalIncludeDirectories="..\Include,..\PC" AdditionalIncludeDirectories="..\Include,..\PC"
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment
GitLab Nexedi Edition | About GitLab | About Nexedi | 沪ICP备2021021310号-2 | 沪ICP备2021021310号-7