archive/php-src
1
0
Fork 0
mirror of https://github.com/php/php-src.git synced 2025-08-16 05:58:45 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 3

Merge branch 'PHP-7.1' into PHP-7.2

Browse source 
* PHP-7.1:
  Finer conditions, so /Qspectre is already usable with latest vc15
This commit is contained in:
Anatol Belski 2018-02-05 10:40:45 +01:00
commit 51a0e051fc
1 changed files with 4 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

8
win32/build/confutils.js
View file

@ -3102,11 +3102,11 @@ function toolset_setup_common_cflags()
ADD_FLAG('CFLAGS', ' /RTC1 '); ADD_FLAG('CFLAGS', ' /RTC1 ');
} else { } else {
if (PHP_DEBUG == "no" && PHP_SECURITY_FLAGS == "yes") { if (PHP_DEBUG == "no" && PHP_SECURITY_FLAGS == "yes") {
/* Mitigations for Spectre variant 1, see /* Mitigations for CVE-2017-5753.
https://blogs.msdn.microsoft.com/vcblog/2018/01/15/spectre-mitigations-in-msvc/ TODO backport for all supported VS versions when they release it. */
TODO backport for all supported VS versions when they release it. */
if (VCVERS >= 1912) { if (VCVERS >= 1912) {
if (VCVERS >= 1913) { var subver1912 = probe_binary(PHP_CL).substr(6);
if (VCVERS >= 1913 || 1912 == VCVERS && subver1912 >= 25835) {
ADD_FLAG('CFLAGS', "/Qspectre"); ADD_FLAG('CFLAGS', "/Qspectre");
} else { } else {
/* Undocumented. */ /* Undocumented. */