Modified config files to add the compiler flag, /Qspectre (#878)

microsoft · Nov 13, 2018 · 69e8208 · 69e8208
1 parent 3679b48
commit 69e8208
Show file tree

Hide file tree

Showing 3 changed files with 18 additions and 4 deletions.
diff --git a/appveyor.yml b/appveyor.yml
@@ -24,7 +24,7 @@ environment:
         SQL_INSTANCE: SQL2017
         PHP_VC: 15
         PHP_MAJOR_VER: 7.2
-        PHP_MINOR_VER: latest
+        PHP_MINOR_VER: 11
         PHP_EXE_PATH: x64\Release_TS
         THREAD: ts
         platform: x64

diff --git a/source/pdo_sqlsrv/config.w32 b/source/pdo_sqlsrv/config.w32
@@ -37,8 +37,15 @@ if( PHP_PDO_SQLSRV != "no" ) {
             if (PHP_DEBUG != "yes") ADD_FLAG( "CFLAGS_PDO_SQLSRV", "/guard:cf /O2" );
             ADD_FLAG( "CFLAGS_PDO_SQLSRV", "/D ZEND_WIN32_FORCE_INLINE" );
             if (VCVERS >= 1913) {
+                ADD_FLAG("LDFLAGS_PDO_SQLSRV", "/d2:-guardspecload");
                 ADD_FLAG("CFLAGS_PDO_SQLSRV", "/Qspectre");
-            } 
+            } else if (VCVERS == 1900) {
+                var subver1900 = probe_binary(PHP_CL).substr(6);
+                if (subver1900 >= 24241) {
+                    ADD_FLAG("LDFLAGS_PDO_SQLSRV", "/d2:-guardspecload");
+                    ADD_FLAG('CFLAGS_PDO_SQLSRV', "/Qspectre");
+                }
+            }
             ADD_EXTENSION_DEP('pdo_sqlsrv', 'pdo');
             EXTENSION("pdo_sqlsrv", pdo_sqlsrv_src_class, PHP_PDO_SQLSRV_SHARED, "/DZEND_ENABLE_STATIC_TSRMLS_CACHE=1");
     } else {

diff --git a/source/sqlsrv/config.w32 b/source/sqlsrv/config.w32
@@ -36,11 +36,18 @@ if( PHP_SQLSRV != "no" ) {
             ADD_FLAG( "CFLAGS_SQLSRV", "/GS" );
             ADD_FLAG( "CFLAGS_SQLSRV", "/Zi" );
             if (VCVERS >= 1913) {
+                ADD_FLAG("LDFLAGS_SQLSRV", "/d2:-guardspecload");
                 ADD_FLAG("CFLAGS_SQLSRV", "/Qspectre");
-            } 
+            } else if (VCVERS == 1900) {
+                var subver1900 = probe_binary(PHP_CL).substr(6);
+                if (subver1900 >= 24241) {
+                    ADD_FLAG("LDFLAGS_SQLSRV", "/d2:-guardspecload");
+                    ADD_FLAG('CFLAGS_SQLSRV', "/Qspectre");
+                }
+            }
             if (PHP_DEBUG != "yes") ADD_FLAG( "CFLAGS_SQLSRV", "/guard:cf /O2" );
             EXTENSION("sqlsrv", sqlsrv_src_class , PHP_SQLSRV_SHARED, "/DZEND_ENABLE_STATIC_TSRMLS_CACHE=1");
     } else {
         WARNING("sqlsrv not enabled; libraries and headers not found");
-	}
+    }
 }