Skip to content

Commit 8e146c8

Browse files
committed
Merge branch 'PHP-8.1' into PHP-8.2
2 parents 2dfb537 + be53e5e commit 8e146c8

File tree

2 files changed

+13
-0
lines changed

2 files changed

+13
-0
lines changed

NEWS

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,9 @@ PHP NEWS
1818
- Date:
1919
. Fixed bug with parsing large negative numbers with the @ notation. (Derick)
2020

21+
- Core:
22+
. Fixes segfault with Fiber on FreeBSD i386 architecture. (David Carlier)
23+
2124
- Fileinfo:
2225
. Fixed bug GH-8805 (finfo returns wrong mime type for woff/woff2 files).
2326
(Anatol)

configure.ac

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1224,6 +1224,7 @@ AS_CASE([$host_cpu],
12241224
AS_CASE([$host_os],
12251225
[darwin*], [fiber_os="mac"],
12261226
[aix*|os400*], [fiber_os="aix"],
1227+
[freebsd*], [fiber_os="freebsd"],
12271228
[fiber_os="other"]
12281229
)
12291230

@@ -1247,6 +1248,15 @@ elif test "$fiber_os" = 'aix'; then
12471248
# AIX uses a different calling convention (shared with non-_CALL_ELF Linux).
12481249
# The AIX assembler isn't GNU, but the file is compatible.
12491250
fiber_asm_file="${fiber_asm_file_prefix}_xcoff_gas"
1251+
elif test "$fiber_os" = 'freebsd'; then
1252+
case $fiber_cpu in
1253+
i386*)
1254+
fiber_asm="no"
1255+
;;
1256+
*)
1257+
fiber_asm_file="${fiber_asm_file_prefix}_elf_gas"
1258+
;;
1259+
esac
12501260
elif test "$fiber_asm_file_prefix" != 'unknown'; then
12511261
fiber_asm_file="${fiber_asm_file_prefix}_elf_gas"
12521262
else

0 commit comments

Comments
 (0)