summaryrefslogtreecommitdiff
path: root/win32
diff options
context:
space:
mode:
authorAnatol Belski <ab@php.net>2018-02-05 10:40:45 +0100
committerAnatol Belski <ab@php.net>2018-02-05 10:40:45 +0100
commit51a0e051fc4c169055b0a24b2754eb3a31a6ee68 (patch)
treed013c2eb7c0485a7b228547bab7f91d27fb7a9ea /win32
parent3ef3f74a65d3cd8c1e5f116e7a363b1e0bde5a88 (diff)
parent1368aea352efc262d16ee9dc8e3d019908180b09 (diff)
downloadphp-git-51a0e051fc4c169055b0a24b2754eb3a31a6ee68.tar.gz
Merge branch 'PHP-7.1' into PHP-7.2
* PHP-7.1: Finer conditions, so /Qspectre is already usable with latest vc15
Diffstat (limited to 'win32')
-rw-r--r--win32/build/confutils.js8
1 files changed, 4 insertions, 4 deletions
diff --git a/win32/build/confutils.js b/win32/build/confutils.js
index 2dc1f0affb..c43ffd5547 100644
--- a/win32/build/confutils.js
+++ b/win32/build/confutils.js
@@ -3102,11 +3102,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. */