diff options
| author | Anatol Belski <ab@php.net> | 2018-02-05 10:41:22 +0100 |
|---|---|---|
| committer | Anatol Belski <ab@php.net> | 2018-02-05 10:41:22 +0100 |
| commit | 7416562ab0c1062722c43c6b55d38e1a79f217cb (patch) | |
| tree | 66c0b8d9b2870e4fb9ef265c7d269e927b430252 /win32/build/confutils.js | |
| parent | ab44dddfe4f0270f7ae84f5e61578e75c2005bc3 (diff) | |
| parent | 51a0e051fc4c169055b0a24b2754eb3a31a6ee68 (diff) | |
| download | php-git-7416562ab0c1062722c43c6b55d38e1a79f217cb.tar.gz | |
Merge branch 'PHP-7.2'
* PHP-7.2:
Finer conditions, so /Qspectre is already usable with latest vc15
Diffstat (limited to 'win32/build/confutils.js')
| -rw-r--r-- | win32/build/confutils.js | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/win32/build/confutils.js b/win32/build/confutils.js index ce3c3d109f..a3dc323822 100644 --- a/win32/build/confutils.js +++ b/win32/build/confutils.js @@ -3179,11 +3179,11 @@ function toolset_setup_common_cflags() 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. */ + /* Mitigations for CVE-2017-5753. + TODO backport for all supported VS versions when they release it. */ 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"); } else { /* Undocumented. */ |