Skip to content

Commit 69e8208

Browse files
authored
Modified config files to add the compiler flag, /Qspectre (#878)
1 parent 3679b48 commit 69e8208

File tree

3 files changed

+18
-4
lines changed

3 files changed

+18
-4
lines changed

appveyor.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ environment:
2424
SQL_INSTANCE: SQL2017
2525
PHP_VC: 15
2626
PHP_MAJOR_VER: 7.2
27-
PHP_MINOR_VER: latest
27+
PHP_MINOR_VER: 11
2828
PHP_EXE_PATH: x64\Release_TS
2929
THREAD: ts
3030
platform: x64

source/pdo_sqlsrv/config.w32

Lines changed: 8 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -37,8 +37,15 @@ if( PHP_PDO_SQLSRV != "no" ) {
3737
if (PHP_DEBUG != "yes") ADD_FLAG( "CFLAGS_PDO_SQLSRV", "/guard:cf /O2" );
3838
ADD_FLAG( "CFLAGS_PDO_SQLSRV", "/D ZEND_WIN32_FORCE_INLINE" );
3939
if (VCVERS >= 1913) {
40+
ADD_FLAG("LDFLAGS_PDO_SQLSRV", "/d2:-guardspecload");
4041
ADD_FLAG("CFLAGS_PDO_SQLSRV", "/Qspectre");
41-
}
42+
} else if (VCVERS == 1900) {
43+
var subver1900 = probe_binary(PHP_CL).substr(6);
44+
if (subver1900 >= 24241) {
45+
ADD_FLAG("LDFLAGS_PDO_SQLSRV", "/d2:-guardspecload");
46+
ADD_FLAG('CFLAGS_PDO_SQLSRV', "/Qspectre");
47+
}
48+
}
4249
ADD_EXTENSION_DEP('pdo_sqlsrv', 'pdo');
4350
EXTENSION("pdo_sqlsrv", pdo_sqlsrv_src_class, PHP_PDO_SQLSRV_SHARED, "/DZEND_ENABLE_STATIC_TSRMLS_CACHE=1");
4451
} else {

source/sqlsrv/config.w32

Lines changed: 9 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -36,11 +36,18 @@ if( PHP_SQLSRV != "no" ) {
3636
ADD_FLAG( "CFLAGS_SQLSRV", "/GS" );
3737
ADD_FLAG( "CFLAGS_SQLSRV", "/Zi" );
3838
if (VCVERS >= 1913) {
39+
ADD_FLAG("LDFLAGS_SQLSRV", "/d2:-guardspecload");
3940
ADD_FLAG("CFLAGS_SQLSRV", "/Qspectre");
40-
}
41+
} else if (VCVERS == 1900) {
42+
var subver1900 = probe_binary(PHP_CL).substr(6);
43+
if (subver1900 >= 24241) {
44+
ADD_FLAG("LDFLAGS_SQLSRV", "/d2:-guardspecload");
45+
ADD_FLAG('CFLAGS_SQLSRV', "/Qspectre");
46+
}
47+
}
4148
if (PHP_DEBUG != "yes") ADD_FLAG( "CFLAGS_SQLSRV", "/guard:cf /O2" );
4249
EXTENSION("sqlsrv", sqlsrv_src_class , PHP_SQLSRV_SHARED, "/DZEND_ENABLE_STATIC_TSRMLS_CACHE=1");
4350
} else {
4451
WARNING("sqlsrv not enabled; libraries and headers not found");
45-
}
52+
}
4653
}

0 commit comments

Comments
 (0)