From: Anatol Belski <ab@php.net>
Date: Sat, 7 Jan 2017 01:48:14 +0000 (+0100)
Subject: Merge branch 'PHP-7.0' into PHP-7.1
X-Git-Tag: php-7.1.2RC1~138
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=22ed374c9ab1130acf1f457045d657bd768d420b;p=php

Merge branch 'PHP-7.0' into PHP-7.1

* PHP-7.0:
  /guard is also a security flag
---

22ed374c9ab1130acf1f457045d657bd768d420b
diff --cc win32/build/confutils.js
index d9fef5f996,8eb0c19a9d..1307d732ee
--- a/win32/build/confutils.js
+++ b/win32/build/confutils.js
@@@ -3041,17 -2856,10 +3041,19 @@@ function toolset_setup_common_cflags(
  			ADD_FLAG('CFLAGS', ' /RTC1 ');
  		} else {
  			if (VCVERS >= 1900) {
- 				ADD_FLAG('CFLAGS', "/guard:cf");
+ 				if (PHP_SECURITY_FLAGS == "yes") {
+ 					ADD_FLAG('CFLAGS', "/guard:cf");
+ 				}
  			}
 +			if (VCVERS >= 1800) {
 +				if (PHP_PGI != "yes" && PHP_PGO != "yes") {
 +					ADD_FLAG('CFLAGS', "/Zc:inline");
 +				}
 +				/* We enable /opt:icf only with the debug pack, so /Gw only makes sense there, too. */
 +				if (PHP_DEBUG_PACK == "yes") {
 +					ADD_FLAG('CFLAGS', "/Gw");
 +				}
 +			}
  		}
  
  	} else if (CLANG_TOOLSET) {