Skip to content

Commit 53e1698

Browse files
petkpetk
committed
Merge branch 'PHP-8.4' into PHP-8.5
2 parents 3ba1020 + 44f9096 commit 53e1698

File tree

13 files changed

+50
-43
lines changed

13 files changed

+50
-43
lines changed

‎cmake/CMakeLists.txt‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@ endif()
3030

3131
# Enable Assembly language dialect.
3232
if(CMAKE_SYSTEM_NAME STREQUAL "Windows")
33-
if(CMAKE_SYSTEM_PROCESSOR MATCHES "^ARM")
33+
if(CMAKE_C_COMPILER_ARCHITECTURE_ID MATCHES "(ARM|arm|aarch64)")
3434
enable_language(ASM_MARMASM)
3535
else()
3636
enable_language(ASM_MASM)

‎cmake/Zend/CMakeLists.txt‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -44,7 +44,7 @@ project(
4444

4545
# Enable Assembly language dialect.
4646
if(CMAKE_SYSTEM_NAME STREQUAL "Windows")
47-
if(CMAKE_SYSTEM_PROCESSOR MATCHES "^ARM")
47+
if(CMAKE_C_COMPILER_ARCHITECTURE_ID MATCHES "(ARM|arm|aarch64)")
4848
enable_language(ASM_MARMASM)
4949
else()
5050
enable_language(ASM_MASM)

‎cmake/Zend/cmake/Fibers.cmake‎

Lines changed: 17 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -77,30 +77,30 @@ block()
7777
set(compileDefinitions "")
7878

7979
# Determine files based on the architecture and platform.
80-
if(CMAKE_SYSTEM_PROCESSOR MATCHES "^(x86_64|amd64)$")
80+
if(CMAKE_C_COMPILER_ARCHITECTURE_ID MATCHES "x86_64")
8181
set(prefix "x86_64_sysv")
82-
elseif(CMAKE_SYSTEM_PROCESSOR MATCHES "^(x86.*|amd.*|i.?86.*|pentium)$")
82+
elseif(CMAKE_C_COMPILER_ARCHITECTURE_ID MATCHES "i[3456]86")
8383
set(cpu "i386")
8484
set(prefix "i386_sysv")
85-
elseif(CMAKE_SYSTEM_PROCESSOR MATCHES "^(aarch64.*|arm64.*)")
85+
elseif(CMAKE_C_COMPILER_ARCHITECTURE_ID MATCHES "(aarch64|arm64)")
8686
set(prefix "arm64_aapcs")
87-
elseif(CMAKE_SYSTEM_PROCESSOR MATCHES "arm.*")
87+
elseif(CMAKE_C_COMPILER_ARCHITECTURE_ID MATCHES "arm")
8888
set(prefix "arm_aapcs")
89-
elseif(CMAKE_SYSTEM_PROCESSOR MATCHES "ppc64.*|powerpc64.*")
89+
elseif(CMAKE_C_COMPILER_ARCHITECTURE_ID MATCHES "(ppc64|PPC64)")
9090
set(prefix "ppc64_sysv")
91-
elseif(CMAKE_SYSTEM_PROCESSOR MATCHES "ppc.*|powerpc.*")
91+
elseif(CMAKE_C_COMPILER_ARCHITECTURE_ID MATCHES "(ppc|PPC)")
9292
set(prefix "ppc32_sysv")
93-
elseif(CMAKE_SYSTEM_PROCESSOR MATCHES "^riscv64.*")
93+
elseif(CMAKE_C_COMPILER_ARCHITECTURE_ID MATCHES "(riscv64|RISCV)")
9494
set(prefix "riscv64_sysv")
95-
elseif(CMAKE_SYSTEM_PROCESSOR MATCHES "^sparc64.*")
95+
elseif(CMAKE_C_COMPILER_ARCHITECTURE_ID MATCHES "sparc64")
9696
set(prefix "sparc64_sysv")
97-
elseif(CMAKE_SYSTEM_PROCESSOR MATCHES "s390x.*")
97+
elseif(CMAKE_C_COMPILER_ARCHITECTURE_ID MATCHES "s390x")
9898
set(prefix "s390x_sysv")
99-
elseif(CMAKE_SYSTEM_PROCESSOR MATCHES "^loongarch64.*")
99+
elseif(CMAKE_C_COMPILER_ARCHITECTURE_ID MATCHES "loongarch64")
100100
set(prefix "loongarch_sysv")
101-
elseif(CMAKE_SYSTEM_PROCESSOR STREQUAL "mips64")
101+
elseif(CMAKE_C_COMPILER_ARCHITECTURE_ID MATCHES "mips64")
102102
set(prefix "mips64_n64")
103-
elseif(CMAKE_SYSTEM_PROCESSOR STREQUAL "mips")
103+
elseif(CMAKE_C_COMPILER_ARCHITECTURE_ID MATCHES "mips")
104104
set(prefix "mips32_o32")
105105
endif()
106106

@@ -115,22 +115,22 @@ block()
115115
set(asmFile "${prefix}_elf_gas.S")
116116
endif()
117117
elseif(CMAKE_SYSTEM_NAME STREQUAL "Windows")
118-
if(CMAKE_SYSTEM_PROCESSOR MATCHES "^(x86_64|amd64|AMD64)$")
118+
if(CMAKE_C_COMPILER_ARCHITECTURE_ID MATCHES "(x86_64|x64)")
119119
set(asmFile "x86_64_ms_pe_masm.asm")
120-
elseif(CMAKE_SYSTEM_PROCESSOR MATCHES "^(x86|i.?86.*|pentium)$")
120+
elseif(CMAKE_C_COMPILER_ARCHITECTURE_ID MATCHES "(X86|i[3456]86)")
121121
set(asmFile "i386_ms_pe_masm.asm")
122-
elseif(CMAKE_SYSTEM_PROCESSOR MATCHES "^(arm64|ARM64)$")
122+
elseif(CMAKE_C_COMPILER_ARCHITECTURE_ID MATCHES "(ARM64|aarch64)")
123123
set(asmFile "arm64_aapcs_pe_armasm.asm")
124124
set(compileOptions /nologo -machine ARM64)
125125
endif()
126126

127-
if(asmFile AND NOT CMAKE_SYSTEM_PROCESSOR MATCHES "^(arm64|ARM64)$")
127+
if(asmFile AND NOT CMAKE_C_COMPILER_ARCHITECTURE_ID MATCHES "(ARM64|aarch64)")
128128
set(compileOptions /nologo)
129129

130130
set(compileDefinitions "BOOST_CONTEXT_EXPORT=EXPORT")
131131
endif()
132132
elseif(CMAKE_SYSTEM_NAME STREQUAL "Midipix")
133-
if(CMAKE_SYSTEM_PROCESSOR MATCHES "^(x86_64|amd64)$")
133+
if(CMAKE_C_COMPILER_ARCHITECTURE_ID MATCHES "x86_64")
134134
set(asmFile "x86_64_ms_pe_gas.S")
135135
endif()
136136
elseif(prefix)

‎cmake/cmake/Configuration.cmake‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@ set(PHP_BUILD_SYSTEM "${PHP_UNAME}" CACHE STRING "Build system uname")
3434
mark_as_advanced(PHP_BUILD_SYSTEM)
3535

3636
set(
37-
PHP_BUILD_ARCH "${CMAKE_SYSTEM_PROCESSOR}"
37+
PHP_BUILD_ARCH "${CMAKE_C_COMPILER_ARCHITECTURE_ID}"
3838
CACHE STRING "Build target architecture displayed in phpinfo"
3939
)
4040
mark_as_advanced(PHP_BUILD_ARCH)

‎cmake/cmake/ConfigureChecks.cmake‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -597,7 +597,7 @@ php_search_libraries(
597597
TARGET php_config INTERFACE
598598
)
599599

600-
if(CMAKE_SYSTEM_PROCESSOR MATCHES "^riscv64.*")
600+
if(CMAKE_C_COMPILER_ARCHITECTURE_ID MATCHES "(riscv64|RISCV)")
601601
find_package(Atomic)
602602

603603
if(Atomic_FOUND)

‎cmake/cmake/Flags.cmake‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ include(PHP/CheckCompilerFlag)
1111
get_property(enabledLanguages GLOBAL PROPERTY ENABLED_LANGUAGES)
1212

1313
# See https://bugs.php.net/28605.
14-
if(CMAKE_SYSTEM_PROCESSOR MATCHES "^alpha")
14+
if(CMAKE_C_COMPILER_ARCHITECTURE_ID MATCHES "alpha")
1515
if(CMAKE_C_COMPILER_ID MATCHES "^(.*Clang|GNU)$")
1616
target_compile_options(php_config INTERFACE $<$<COMPILE_LANGUAGE:C>:-mieee>)
1717
else()

‎cmake/cmake/Summary.cmake‎

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ include(FeatureSummary)
1414
# Add new item to the summary preamble with dotted leader.
1515
function(_php_summary_preamble_add_item label value output)
1616
# Template helper to calculate column width.
17-
set(template " * <label> .................... : <value>")
17+
set(template " * <label> ........................... : <value>")
1818
string(REGEX MATCH "^ \\\* ([^ ]+ [.]+)" _ "${template}")
1919
string(LENGTH "${CMAKE_MATCH_1}" columnWidth)
2020

@@ -149,6 +149,12 @@ function(_php_summary_preamble result)
149149
preamble
150150
)
151151

152+
_php_summary_preamble_add_item(
153+
"CMAKE_C_COMPILER_ARCHITECTURE_ID"
154+
"${CMAKE_C_COMPILER_ARCHITECTURE_ID}"
155+
preamble
156+
)
157+
152158
_php_summary_preamble_add_item(
153159
"CMake version"
154160
"${CMAKE_VERSION}"

‎cmake/cmake/checks/CheckSegmentsAlignment.cmake‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ message(
2424

2525
if(
2626
NOT CMAKE_SYSTEM_NAME STREQUAL "Linux"
27-
OR NOT CMAKE_SYSTEM_PROCESSOR MATCHES "^(i[3456]86.*|x86_64)$"
27+
OR NOT CMAKE_C_COMPILER_ARCHITECTURE_ID MATCHES "(i[3456]86|x86_64)"
2828
)
2929
message(CHECK_FAIL "no")
3030
return()

‎cmake/cmake/modules/FindMC.cmake‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -122,7 +122,7 @@ block()
122122

123123
# Adjustments for architecture whether target is 64-bit or 32-bit.
124124
if(CMAKE_SIZEOF_VOID_P EQUAL 8)
125-
if(CMAKE_SYSTEM_PROCESSOR STREQUAL "ARM64")
125+
if(CMAKE_C_COMPILER_ARCHITECTURE_ID MATCHES "(ARM64|aarch64)")
126126
list(TRANSFORM hints APPEND /arm64)
127127
else()
128128
list(TRANSFORM hints APPEND /x64)

‎cmake/ext/opcache/CMakeLists.txt‎

Lines changed: 9 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -123,20 +123,16 @@ endif()
123123

124124
# Check if JIT is supported by the target architecture.
125125
if(PHP_EXT_OPCACHE_JIT)
126-
if(
127-
# *nix:
128-
NOT CMAKE_SYSTEM_PROCESSOR MATCHES "^(i[34567]86.*|x86.*|amd64|aarch64.*)$"
129-
# Windows:
130-
AND NOT CMAKE_SYSTEM_PROCESSOR MATCHES "^(X86|AMD64)$"
131-
)
126+
if(NOT CMAKE_C_COMPILER_ARCHITECTURE_ID MATCHES "(i[3456]86|x86_64|aarch64|arm64|x64|X86)")
132127
message(
133128
WARNING
134-
"JIT is not supported by target architecture ${CMAKE_SYSTEM_PROCESSOR}"
129+
"JIT is not supported by target architecture "
130+
"${CMAKE_C_COMPILER_ARCHITECTURE_ID}"
135131
)
136132
set_property(CACHE PHP_EXT_OPCACHE_JIT PROPERTY VALUE OFF)
137133
elseif(
138134
CMAKE_SYSTEM_NAME STREQUAL "Darwin"
139-
AND CMAKE_SYSTEM_PROCESSOR MATCHES "^aarch64.*$"
135+
AND CMAKE_C_COMPILER_ARCHITECTURE_ID MATCHES "arm64"
140136
AND PHP_THREAD_SAFETY
141137
)
142138
message(
@@ -161,23 +157,23 @@ if(PHP_EXT_OPCACHE_JIT)
161157
set(tls_target "")
162158

163159
# Find out which ABI to use.
164-
if(CMAKE_SYSTEM_PROCESSOR MATCHES "^(x86_64|amd64|AMD64|ARM64)$")
160+
if(CMAKE_C_COMPILER_ARCHITECTURE_ID MATCHES "(x86_64|x64)")
165161
set(dasm_arch "x86")
166162
set(dasm_flags -D X64=1)
167163
set(ir_target "IR_TARGET_X64")
168164
set(tls_target "x86_64")
169-
elseif(CMAKE_SYSTEM_PROCESSOR MATCHES "^(i[34567]86.*|x86.*|X86)$")
165+
elseif(CMAKE_C_COMPILER_ARCHITECTURE_ID MATCHES "(i[34567]86|X86)")
170166
set(dasm_arch "x86")
171167
set(ir_target "IR_TARGET_X86")
172168
set(tls_target "x86")
173-
elseif(CMAKE_SYSTEM_PROCESSOR MATCHES "^aarch64.*")
169+
elseif(CMAKE_C_COMPILER_ARCHITECTURE_ID MATCHES "(arm64|aarch64")
174170
set(dasm_arch "aarch64")
175171
set(ir_target "IR_TARGET_AARCH64")
176172
set(tls_target "aarch64")
177173
endif()
178174

179175
if(
180-
CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64"
176+
CMAKE_C_COMPILER_ARCHITECTURE_ID MATCHES "x86_64"
181177
AND CMAKE_SYSTEM_NAME STREQUAL "Darwin"
182178
)
183179
list(APPEND dasm_flags -D X64APPLE=1)
@@ -190,7 +186,7 @@ if(PHP_EXT_OPCACHE_JIT)
190186
endif()
191187

192188
if(
193-
CMAKE_SYSTEM_PROCESSOR MATCHES "^(AMD64|ARM64)$"
189+
CMAKE_C_COMPILER_ARCHITECTURE_ID MATCHES "(x86_64|x64)"
194190
AND CMAKE_SYSTEM_NAME STREQUAL "Windows"
195191
)
196192
list(APPEND dasm_flags -D X64WIN=1)

0 commit comments

Comments
 (0)