File tree 3 files changed +12
-3
lines changed
3 files changed +12
-3
lines changed Original file line number Diff line number Diff line change @@ -12,6 +12,7 @@ PHP NEWS
12
12
. Fixed bug GH-13178 (Iterator positions incorrect when converting packed
13
13
array to hashed). (ilutov)
14
14
. Fixed zend fiber build for solaris default mode (32 bits). (David Carlier)
15
+ . Fixed zend call stack size for macOs/arm64. (David Carlier)
15
16
16
17
- Curl:
17
18
. Deprecated the CURLOPT_BINARYTRANSFER constant. (divinity76)
Original file line number Diff line number Diff line change @@ -15,7 +15,10 @@ $stack = zend_test_zend_call_stack_get();
15
15
var_dump ($ stack );
16
16
17
17
$ expectedMaxSize = match (php_uname ('s ' )) {
18
- 'Darwin ' => 8 *1024 *1024 ,
18
+ 'Darwin ' => match (php_uname ('m ' )) {
19
+ 'x86_64 ' => 8 *1024 *1024 ,
20
+ 'arm64 ' => 8372224 ,
21
+ },
19
22
'FreeBSD ' => match (php_uname ('m ' )) {
20
23
'amd64 ' => 512 *1024 *1024 - 4096 ,
21
24
'i386 ' => 64 *1024 *1024 - 4096 ,
Original file line number Diff line number Diff line change @@ -427,7 +427,9 @@ static bool zend_call_stack_get_macos(zend_call_stack *stack)
427
427
void * base = pthread_get_stackaddr_np (pthread_self ());
428
428
size_t max_size ;
429
429
430
- if (pthread_main_np ()) {
430
+ #if !defined(__aarch64__ )
431
+ if (pthread_main_np ())
432
+ {
431
433
/* pthread_get_stacksize_np() returns a too low value for the main
432
434
* thread in OSX 10.9, 10.10:
433
435
* https://mail.openjdk.org/pipermail/hotspot-dev/2013-October/011353.html
@@ -437,7 +439,10 @@ static bool zend_call_stack_get_macos(zend_call_stack *stack)
437
439
/* Stack size is 8MiB by default for main threads
438
440
* https://developer.apple.com/library/archive/documentation/Cocoa/Conceptual/Multithreading/CreatingThreads/CreatingThreads.html */
439
441
max_size = 8 * 1024 * 1024 ;
440
- } else {
442
+ }
443
+ else
444
+ #endif
445
+ {
441
446
max_size = pthread_get_stacksize_np (pthread_self ());
442
447
}
443
448
You can’t perform that action at this time.
0 commit comments