Merge branch 'PHP-8.1' into PHP-8.2

This commit is contained in:
David Carlier 2022-10-10 12:31:57 +01:00
commit 8e146c8806
2 changed files with 13 additions and 0 deletions

3
NEWS
View File

@ -18,6 +18,9 @@ PHP NEWS
- Date:
. Fixed bug with parsing large negative numbers with the @ notation. (Derick)
- Core:
. Fixes segfault with Fiber on FreeBSD i386 architecture. (David Carlier)
- Fileinfo:
. Fixed bug GH-8805 (finfo returns wrong mime type for woff/woff2 files).
(Anatol)

View File

@ -1224,6 +1224,7 @@ AS_CASE([$host_cpu],
AS_CASE([$host_os],
[darwin*], [fiber_os="mac"],
[aix*|os400*], [fiber_os="aix"],
[freebsd*], [fiber_os="freebsd"],
[fiber_os="other"]
)
@ -1247,6 +1248,15 @@ elif test "$fiber_os" = 'aix'; then
# AIX uses a different calling convention (shared with non-_CALL_ELF Linux).
# The AIX assembler isn't GNU, but the file is compatible.
fiber_asm_file="${fiber_asm_file_prefix}_xcoff_gas"
elif test "$fiber_os" = 'freebsd'; then
case $fiber_cpu in
i386*)
fiber_asm="no"
;;
*)
fiber_asm_file="${fiber_asm_file_prefix}_elf_gas"
;;
esac
elif test "$fiber_asm_file_prefix" != 'unknown'; then
fiber_asm_file="${fiber_asm_file_prefix}_elf_gas"
else