Skip to content

Commit 994f429

Browse files
committed
Merge branch 'PHP-8.4'
2 parents 5946d68 + 766a766 commit 994f429

File tree

6 files changed

+33
-5
lines changed

6 files changed

+33
-5
lines changed

cmake/cmake/Configuration.cmake

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -132,6 +132,8 @@ mark_as_advanced(PHP_DTRACE)
132132

133133
set(PHP_FD_SETSIZE "" CACHE STRING "Size of file descriptor sets")
134134
if(CMAKE_SYSTEM_NAME STREQUAL "Windows" AND PHP_FD_SETSIZE STREQUAL "")
135+
# This allows up to 256 sockets to be select()ed in a single call to select(),
136+
# instead of the usual 64.
135137
set_property(CACHE PHP_FD_SETSIZE PROPERTY VALUE "256")
136138
endif()
137139
mark_as_advanced(PHP_FD_SETSIZE)

cmake/cmake/ConfigureChecks.cmake

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -448,7 +448,7 @@ if(PHP_FD_SETSIZE MATCHES "^[0-9]+$" AND PHP_FD_SETSIZE GREATER 0)
448448
target_compile_definitions(
449449
php_config
450450
INTERFACE
451-
$<$<COMPILE_LANGUAGE:ASM,C,CXX>:FD_SETSIZE=${PHP_FD_SETSIZE}>
451+
$<$<COMPILE_LANGUAGE:C,CXX>:FD_SETSIZE=${PHP_FD_SETSIZE}>
452452
)
453453
elseif(NOT PHP_FD_SETSIZE STREQUAL "")
454454
message(
@@ -895,7 +895,7 @@ if(PHP_DMALLOC)
895895
target_compile_definitions(
896896
php_config
897897
INTERFACE
898-
$<$<COMPILE_LANGUAGE:ASM,C,CXX>:DMALLOC_FUNC_CHECK>
898+
$<$<COMPILE_LANGUAGE:C,CXX>:DMALLOC_FUNC_CHECK>
899899
)
900900

901901
target_link_libraries(php_config INTERFACE Dmalloc::Dmalloc)

cmake/cmake/Flags.cmake

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -195,6 +195,15 @@ if(PHP_HAS_FFP_CONTRACT_OFF_C)
195195
)
196196
endif()
197197

198+
# Enable inline reader cache.
199+
# https://devblogs.microsoft.com/cppblog/visual-studio-2017-throughput-improvements-and-advice/
200+
if(MSVC)
201+
target_compile_options(
202+
php_config
203+
INTERFACE $<$<COMPILE_LANGUAGE:C,CXX>:/d2FuncCache1>
204+
)
205+
endif()
206+
198207
################################################################################
199208
# Sanitizer flags.
200209
################################################################################

cmake/main/CMakeLists.txt

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,10 @@ PHP main binding.
44

55
include(CheckSymbolExists)
66

7-
# Compile and link properties for all targets in this directory scope.
7+
################################################################################
8+
# Compile and link properties for all binary targets in this directory scope.
9+
################################################################################
10+
811
add_compile_definitions(ZEND_ENABLE_STATIC_TSRMLS_CACHE)
912
link_libraries(PHP::config)
1013

docs/cmake/configuration.md

Lines changed: 14 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3525,14 +3525,26 @@ A list of Autoconf `configure` command-line configuration options, Windows
35253525
</tr>
35263526
<tr>
35273527
<td>N/A</td>
3528+
<td>--without-extra-includes</td>
3529+
<td>N/A</td>
3530+
<td>default</td>
3531+
</tr>
3532+
<tr>
3533+
<td>&emsp;N/A</td>
35283534
<td>--with-extra-includes</td>
3529-
<td></td>
3535+
<td>N/A</td>
35303536
<td></td>
35313537
</tr>
35323538
<tr>
35333539
<td>N/A</td>
3540+
<td>--without-extra-libs</td>
3541+
<td>N/A</td>
3542+
<td>default</td>
3543+
</tr>
3544+
<tr>
3545+
<td>&emsp;N/A</td>
35343546
<td>--with-extra-libs</td>
3535-
<td></td>
3547+
<td>N/A</td>
35363548
<td></td>
35373549
</tr>
35383550
<tr>

docs/evolution.md

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -968,6 +968,8 @@ PHP coding standards now use the C11 standard.
968968
`duplicate_sources` parameter. If truthy, no rules to build the object files
969969
are generated. This allows to build additional variants of SAPIs (e.g., a DLL
970970
and EXE) without duplicate build rules.
971+
* `HAVE_GETLOGIN` preprocessor macro removed from configuration header
972+
(`main/config.w32.h`).
971973
972974
##### Windows configure options
973975

0 commit comments

Comments
 (0)