Merge branch 'PHP-7.0' into PHP-7.1

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

diff --cc win32/build/confutils.js
index d9fef5f996a2c359f820e166ff78a4e3d33b1283,8eb0c19a9d0f0c7737bf2cdd9d99ecab65ecaa42..1307d732ee6ac76f38b0417de73a96025664f611
--- 1/win32/build/confutils.js
--- 2/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) {