Skip to content

Commit 4111f89

Browse files
petkpetk
committed
Merge branch 'PHP-8.3' into PHP-8.4
2 parents 055ef5e + 0ea5ac2 commit 4111f89

File tree

8 files changed

+103
-79
lines changed

8 files changed

+103
-79
lines changed

‎cmake/Zend/CMakeLists.txt‎

Lines changed: 43 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -398,69 +398,93 @@ install(
398398
# Configuration checks.
399399
################################################################################
400400

401-
check_include_files(cpuid.h HAVE_CPUID_H)
402-
check_include_files(libproc.h HAVE_LIBPROC_H)
401+
check_include_files(cpuid.h PHP_ZEND_HAVE_CPUID_H)
402+
set(HAVE_CPUID_H ${PHP_ZEND_HAVE_CPUID_H})
403403

404-
check_symbol_exists(getpid unistd.h HAVE_GETPID)
404+
check_include_files(libproc.h PHP_ZEND_HAVE_LIBPROC_H)
405+
set(HAVE_LIBPROC_H ${PHP_ZEND_HAVE_LIBPROC_H})
406+
407+
check_symbol_exists(getpid unistd.h PHP_ZEND_HAVE_GETPID)
408+
set(HAVE_GETPID ${PHP_ZEND_HAVE_GETPID})
405409

406410
cmake_push_check_state(RESET)
407411
set(CMAKE_REQUIRED_DEFINITIONS -D_GNU_SOURCE)
408-
check_symbol_exists(gettid unistd.h HAVE_GETTID)
412+
check_symbol_exists(gettid unistd.h PHP_ZEND_HAVE_GETTID)
413+
set(HAVE_GETTID ${PHP_ZEND_HAVE_GETTID})
409414
cmake_pop_check_state()
410415

411-
check_symbol_exists(kill signal.h HAVE_KILL)
416+
check_symbol_exists(kill signal.h PHP_ZEND_HAVE_KILL)
417+
set(HAVE_KILL ${PHP_ZEND_HAVE_KILL})
418+
412419
check_symbol_exists(mempcpy string.h HAVE_MEMPCPY)
420+
set(HAVE_MEMPCPY ${PHP_ZEND_HAVE_MEMPCPY})
413421

414422
cmake_push_check_state(RESET)
415423
set(CMAKE_REQUIRED_DEFINITIONS -D_GNU_SOURCE)
416-
check_symbol_exists(mremap sys/mman.h HAVE_MREMAP)
424+
check_symbol_exists(mremap sys/mman.h PHP_ZEND_HAVE_MREMAP)
425+
set(HAVE_MREMAP ${PHP_ZEND_HAVE_MREMAP})
417426
cmake_pop_check_state()
418427

419428
block()
420429
set(headers pthread.h)
421430

422431
# BSD-based systems have pthread_attr_get_np in pthread_np.h.
423-
check_include_files(pthread_np.h PHP_HAS_PTHREAD_NP_H)
424-
if(PHP_HAS_PTHREAD_NP_H)
432+
check_include_files(pthread_np.h PHP_ZEND_HAVE_PTHREAD_NP_H)
433+
if(PHP_ZEND_HAVE_PTHREAD_NP_H)
425434
list(APPEND headers "pthread_np.h")
426435
endif()
427436

428437
check_symbol_exists(
429438
pthread_attr_get_np
430439
"${headers}"
431-
HAVE_PTHREAD_ATTR_GET_NP
440+
PHP_ZEND_HAVE_PTHREAD_ATTR_GET_NP
432441
)
442+
set(HAVE_PTHREAD_ATTR_GET_NP ${PHP_ZEND_HAVE_PTHREAD_ATTR_GET_NP})
433443
endblock()
434444

435445
check_symbol_exists(
436446
pthread_attr_getstack
437447
pthread.h
438-
HAVE_PTHREAD_ATTR_GETSTACK
448+
PHP_ZEND_HAVE_PTHREAD_ATTR_GETSTACK
439449
)
450+
set(HAVE_PTHREAD_ATTR_GETSTACK ${PHP_ZEND_HAVE_PTHREAD_ATTR_GETSTACK})
440451

441452
check_symbol_exists(
442453
pthread_get_stackaddr_np
443454
pthread.h
444-
HAVE_PTHREAD_GET_STACKADDR_NP
455+
PHP_ZEND_HAVE_PTHREAD_GET_STACKADDR_NP
445456
)
457+
set(HAVE_PTHREAD_GET_STACKADDR_NP ${PHP_ZEND_HAVE_PTHREAD_GET_STACKADDR_NP})
446458

447459
cmake_push_check_state(RESET)
448460
set(CMAKE_REQUIRED_DEFINITIONS -D_GNU_SOURCE)
449-
check_symbol_exists(pthread_getattr_np pthread.h HAVE_PTHREAD_GETATTR_NP)
461+
check_symbol_exists(
462+
pthread_getattr_np
463+
pthread.h
464+
PHP_ZEND_HAVE_PTHREAD_GETATTR_NP
465+
)
466+
set(HAVE_PTHREAD_GETATTR_NP ${PHP_ZEND_HAVE_PTHREAD_GETATTR_NP})
450467
cmake_pop_check_state()
451468

452-
check_symbol_exists(pthread_stackseg_np pthread.h HAVE_PTHREAD_STACKSEG_NP)
453-
check_symbol_exists(strnlen string.h HAVE_STRNLEN)
469+
check_symbol_exists(
470+
pthread_stackseg_np
471+
pthread.h
472+
PHP_ZEND_HAVE_PTHREAD_STACKSEG_NP
473+
)
474+
set(HAVE_PTHREAD_STACKSEG_NP ${PHP_ZEND_HAVE_PTHREAD_STACKSEG_NP})
475+
476+
check_symbol_exists(strnlen string.h PHP_ZEND_HAVE_STRNLEN)
477+
set(HAVE_STRNLEN ${PHP_ZEND_HAVE_STRNLEN})
454478

455479
# Check for sigsetjmp(). It can be a function or defined as a macro. Note, that
456480
# POSIX.1-2001-compliant systems should have it. On Windows the setjmp() is
457481
# used instead.
458482
if(NOT CMAKE_SYSTEM_NAME STREQUAL "Windows")
459-
check_symbol_exists(sigsetjmp setjmp.h PHP_HAS_SIGSETJMP)
460-
if(NOT PHP_HAS_SIGSETJMP)
461-
check_symbol_exists(setjmp setjmp.h PHP_HAS_SETJMP)
483+
check_symbol_exists(sigsetjmp setjmp.h PHP_ZEND_HAVE_SIGSETJMP)
484+
if(NOT PHP_ZEND_HAVE_SIGSETJMP)
485+
check_symbol_exists(setjmp setjmp.h PHP_ZEND_HAVE_SETJMP)
462486
endif()
463-
if(NOT PHP_HAS_SIGSETJMP AND NOT PHP_HAS_SETJMP)
487+
if(NOT PHP_ZEND_HAVE_SIGSETJMP AND NOT PHP_ZEND_HAVE_SETJMP)
464488
message(
465489
FATAL_ERROR
466490
"Required function sigsetjmp()/setjmp() not found in <setjmp.h>. Please "
@@ -475,7 +499,7 @@ php_search_libraries(
475499
Pgrab
476500
HEADERS libproc.h
477501
LIBRARIES proc
478-
VARIABLE PHP_ZEND_HAS_PGRAB
502+
VARIABLE PHP_ZEND_HAVE_PGRAB
479503
TARGET zend PRIVATE
480504
)
481505

‎cmake/Zend/cmake/CheckAsmGoto.cmake‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ if(CMAKE_SYSTEM_NAME STREQUAL "Windows")
1616
endif()
1717

1818
# Skip in consecutive configuration phases.
19-
if(NOT DEFINED PHP_ZEND_HAS_ASM_GOTO)
19+
if(NOT DEFINED PHP_ZEND_HAVE_ASM_GOTO)
2020
message(CHECK_START "Checking for the inline assembly __asm__ goto support")
2121

2222
cmake_push_check_state(RESET)
@@ -32,14 +32,14 @@ if(NOT DEFINED PHP_ZEND_HAS_ASM_GOTO)
3232
end:
3333
return 0;
3434
}
35-
]] PHP_ZEND_HAS_ASM_GOTO)
35+
]] PHP_ZEND_HAVE_ASM_GOTO)
3636
cmake_pop_check_state()
3737

38-
if(PHP_ZEND_HAS_ASM_GOTO)
38+
if(PHP_ZEND_HAVE_ASM_GOTO)
3939
message(CHECK_PASS "yes")
4040
else()
4141
message(CHECK_FAIL "no")
4242
endif()
4343
endif()
4444

45-
set(HAVE_ASM_GOTO ${PHP_ZEND_HAS_ASM_GOTO})
45+
set(HAVE_ASM_GOTO ${PHP_ZEND_HAVE_ASM_GOTO})

‎cmake/Zend/cmake/CheckCpuidCount.cmake‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ if(CMAKE_SYSTEM_NAME STREQUAL "Windows")
1515
endif()
1616

1717
# Skip in consecutive configuration phases.
18-
if(NOT DEFINED PHP_ZEND_HAS_CPUID_COUNT)
18+
if(NOT DEFINED PHP_ZEND_HAVE_CPUID_COUNT)
1919
message(CHECK_START "Checking whether __cpuid_count is available")
2020

2121
cmake_push_check_state(RESET)
@@ -28,14 +28,14 @@ if(NOT DEFINED PHP_ZEND_HAS_CPUID_COUNT)
2828
__cpuid_count(0, 0, eax, ebx, ecx, edx);
2929
return 0;
3030
}
31-
]] PHP_ZEND_HAS_CPUID_COUNT)
31+
]] PHP_ZEND_HAVE_CPUID_COUNT)
3232
cmake_pop_check_state()
3333

34-
if(PHP_ZEND_HAS_CPUID_COUNT)
34+
if(PHP_ZEND_HAVE_CPUID_COUNT)
3535
message(CHECK_PASS "yes")
3636
else()
3737
message(CHECK_FAIL "no")
3838
endif()
3939
endif()
4040

41-
set(HAVE_CPUID_COUNT ${PHP_ZEND_HAS_CPUID_COUNT})
41+
set(HAVE_CPUID_COUNT ${PHP_ZEND_HAVE_CPUID_COUNT})

‎cmake/Zend/cmake/CheckFloatPrecision.cmake‎

Lines changed: 20 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ endif()
2323
# Obsolete in favor of C99 <fenv.h> functions to control FPU rounding modes.
2424
function(_php_zend_check_fpu_setcw result)
2525
# Skip in consecutive configuration phases.
26-
if(NOT DEFINED PHP_ZEND_HAS_FPU_SETCW)
26+
if(NOT DEFINED PHP_ZEND_${result})
2727
message(CHECK_START "Checking for usable _FPU_SETCW")
2828

2929
cmake_push_check_state(RESET)
@@ -48,24 +48,24 @@ function(_php_zend_check_fpu_setcw result)
4848

4949
return 0;
5050
}
51-
]] PHP_ZEND_HAS_FPU_SETCW)
51+
]] PHP_ZEND_${result})
5252
cmake_pop_check_state()
5353

54-
if(PHP_ZEND_HAS_FPU_SETCW)
54+
if(PHP_ZEND_${result})
5555
message(CHECK_PASS "yes")
5656
else()
5757
message(CHECK_FAIL "no")
5858
endif()
5959
endif()
6060

61-
set(${result} ${PHP_ZEND_HAS_FPU_SETCW})
61+
set(${result} ${PHP_ZEND_${result}})
6262

6363
return(PROPAGATE ${result})
6464
endfunction()
6565

6666
function(_php_zend_check_fpsetprec result)
6767
# Skip in consecutive configuration phases.
68-
if(NOT DEFINED PHP_ZEND_HAS_FPSETPREC)
68+
if(NOT DEFINED PHP_ZEND_${result})
6969
message(CHECK_START "Checking for usable fpsetprec")
7070

7171
cmake_push_check_state(RESET)
@@ -89,24 +89,24 @@ function(_php_zend_check_fpsetprec result)
8989

9090
return 0;
9191
}
92-
]] PHP_ZEND_HAS_FPSETPREC)
92+
]] PHP_ZEND_${result})
9393
cmake_pop_check_state()
9494

95-
if(PHP_ZEND_HAS_FPSETPREC)
95+
if(PHP_ZEND_${result})
9696
message(CHECK_PASS "yes")
9797
else()
9898
message(CHECK_FAIL "no")
9999
endif()
100100
endif()
101101

102-
set(${result} ${PHP_ZEND_HAS_FPSETPREC})
102+
set(${result} ${PHP_ZEND_${result}})
103103

104104
return(PROPAGATE ${result})
105105
endfunction()
106106

107107
function(_php_zend_check_controlfp result)
108108
# Skip in consecutive configuration phases.
109-
if(NOT DEFINED PHP_ZEND_HAS_CONTROLFP)
109+
if(NOT DEFINED PHP_ZEND_${result})
110110
message(CHECK_START "Checking for usable _controlfp")
111111

112112
cmake_push_check_state(RESET)
@@ -130,24 +130,24 @@ function(_php_zend_check_controlfp result)
130130

131131
return 0;
132132
}
133-
]] PHP_ZEND_HAS_CONTROLFP)
133+
]] PHP_ZEND_${result})
134134
cmake_pop_check_state()
135135

136-
if(PHP_ZEND_HAS_CONTROLFP)
136+
if(PHP_ZEND_${result})
137137
message(CHECK_PASS "yes")
138138
else()
139139
message(CHECK_FAIL "no")
140140
endif()
141141
endif()
142142

143-
set(${result} ${PHP_ZEND_HAS_CONTROLFP})
143+
set(${result} ${PHP_ZEND_${result}})
144144

145145
return(PROPAGATE ${result})
146146
endfunction()
147147

148148
function(_php_zend_check_controlfp_s result)
149149
# Skip in consecutive configuration phases.
150-
if(NOT DEFINED PHP_ZEND_HAS_CONTROLFP_S)
150+
if(NOT DEFINED PHP_ZEND_${result})
151151
message(CHECK_START "Checking for usable _controlfp_s")
152152

153153
cmake_push_check_state(RESET)
@@ -172,24 +172,24 @@ function(_php_zend_check_controlfp_s result)
172172

173173
return 0;
174174
}
175-
]] PHP_ZEND_HAS_CONTROLFP_S)
175+
]] PHP_ZEND_${result})
176176
cmake_pop_check_state()
177177

178-
if(PHP_ZEND_HAS_CONTROLFP_S)
178+
if(PHP_ZEND_${result})
179179
message(CHECK_PASS "yes")
180180
else()
181181
message(CHECK_FAIL "no")
182182
endif()
183183
endif()
184184

185-
set(${result} ${PHP_ZEND_HAS_CONTROLFP_S})
185+
set(${result} ${PHP_ZEND_${result}})
186186

187187
return(PROPAGATE ${result})
188188
endfunction()
189189

190190
function(_php_zend_check_fpu_inline_asm_x86 result)
191191
# Skip in consecutive configuration phases.
192-
if(NOT DEFINED PHP_ZEND_HAS_FPU_INLINE_ASM_X86)
192+
if(NOT DEFINED PHP_ZEND_${result})
193193
message(
194194
CHECK_START
195195
"Checking whether FPU control word can be manipulated by inline assembler"
@@ -215,17 +215,17 @@ function(_php_zend_check_fpu_inline_asm_x86 result)
215215

216216
return 0;
217217
}
218-
]] PHP_ZEND_HAS_FPU_INLINE_ASM_X86)
218+
]] PHP_ZEND_${result})
219219
cmake_pop_check_state()
220220

221-
if(PHP_ZEND_HAS_FPU_INLINE_ASM_X86)
221+
if(PHP_ZEND_${result})
222222
message(CHECK_PASS "yes")
223223
else()
224224
message(CHECK_FAIL "no")
225225
endif()
226226
endif()
227227

228-
set(${result} ${PHP_ZEND_HAS_FPU_INLINE_ASM_X86})
228+
set(${result} ${PHP_ZEND_${result}})
229229

230230
return(PROPAGATE ${result})
231231
endfunction()

‎cmake/Zend/cmake/CheckStrerrorR.cmake‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -18,16 +18,16 @@ if(CMAKE_SYSTEM_NAME STREQUAL "Windows")
1818
return()
1919
endif()
2020

21-
check_symbol_exists(strerror_r string.h PHP_ZEND_HAS_STRERROR_R)
21+
check_symbol_exists(strerror_r string.h PHP_ZEND_HAVE_STRERROR_R)
2222

23-
if(NOT PHP_ZEND_HAS_STRERROR_R)
23+
if(NOT PHP_ZEND_HAVE_STRERROR_R)
2424
return()
2525
endif()
2626

2727
set(HAVE_STRERROR_R TRUE)
2828

2929
# Skip in consecutive configuration phases.
30-
if(NOT DEFINED PHP_ZEND_HAS_STRERROR_R_CHAR_P)
30+
if(NOT DEFINED PHP_ZEND_STRERROR_R_CHAR_P)
3131
message(CHECK_START "Checking strerror_r() return type")
3232

3333
cmake_push_check_state(RESET)
@@ -44,14 +44,14 @@ if(NOT DEFINED PHP_ZEND_HAS_STRERROR_R_CHAR_P)
4444
char *p = strerror_r (0, buf, sizeof buf);
4545
return !p || x;
4646
}
47-
]] PHP_ZEND_HAS_STRERROR_R_CHAR_P)
47+
]] PHP_ZEND_STRERROR_R_CHAR_P)
4848
cmake_pop_check_state()
4949

50-
if(PHP_ZEND_HAS_STRERROR_R_CHAR_P)
50+
if(PHP_ZEND_STRERROR_R_CHAR_P)
5151
message(CHECK_PASS "char *")
5252
else()
5353
message(CHECK_PASS "int")
5454
endif()
5555
endif()
5656

57-
set(STRERROR_R_CHAR_P ${PHP_ZEND_HAS_STRERROR_R_CHAR_P})
57+
set(STRERROR_R_CHAR_P ${PHP_ZEND_STRERROR_R_CHAR_P})

‎cmake/Zend/cmake/GlobalRegisterVariables.cmake‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ if(NOT PHP_ZEND_GLOBAL_REGISTER_VARIABLES)
2222
endif()
2323

2424
# Skip in consecutive configuration phases.
25-
if(NOT DEFINED PHP_ZEND_HAS_GCC_GLOBAL_REGS)
25+
if(NOT DEFINED PHP_ZEND_HAVE_GCC_GLOBAL_REGS)
2626
message(CHECK_START "Checking for global register variables support")
2727

2828
cmake_push_check_state(RESET)
@@ -75,14 +75,14 @@ if(NOT DEFINED PHP_ZEND_HAS_GCC_GLOBAL_REGS)
7575
{
7676
return 0;
7777
}
78-
]] PHP_ZEND_HAS_GCC_GLOBAL_REGS)
78+
]] PHP_ZEND_HAVE_GCC_GLOBAL_REGS)
7979
cmake_pop_check_state()
8080

81-
if(PHP_ZEND_HAS_GCC_GLOBAL_REGS)
81+
if(PHP_ZEND_HAVE_GCC_GLOBAL_REGS)
8282
message(CHECK_PASS "yes")
8383
else()
8484
message(CHECK_FAIL "no")
8585
endif()
8686
endif()
8787

88-
set(HAVE_GCC_GLOBAL_REGS ${PHP_ZEND_HAS_GCC_GLOBAL_REGS})
88+
set(HAVE_GCC_GLOBAL_REGS ${PHP_ZEND_HAVE_GCC_GLOBAL_REGS})

0 commit comments

Comments
 (0)