mirrors/php-src
0
0
Fork 0
mirror of https://github.com/php/php-src.git synced 2024-11-25 10:54:15 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'PHP-7.2'

Browse Source 
* PHP-7.2:
  Add switches for Spectre variant 1 mitigation
This commit is contained in:
Anatol Belski 2018-01-17 14:48:06 +01:00
commit e9eff0a425
1 changed files with 13 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
win32/build/confutils.js
View File

@ -3177,6 +3177,19 @@ function toolset_setup_common_cflags()
// Set some debug/release specific options
ADD_FLAG('CFLAGS', ' /RTC1 ');
} else {
if (PHP_DEBUG == "no" && PHP_SECURITY_FLAGS == "yes") {
/* Mitigations for Spectre variant 1, see
https://blogs.msdn.microsoft.com/vcblog/2018/01/15/spectre-mitigations-in-msvc/
TODO backport for all supported VS versions when they release it. */
if (VCVERS >= 1912) {
if (VCVERS >= 1913) {
ADD_FLAG('CFLAGS', "/Qspectre");
} else {
/* Undocumented. */
ADD_FLAG('CFLAGS', "/d2guardspecload");
}
}
}
if (VCVERS >= 1900) {
if (PHP_SECURITY_FLAGS == "yes") {
ADD_FLAG('CFLAGS', "/guard:cf");