Skip to content

Commit be53e5e

Browse files
committed
Fix GH-9566: disable assembly for Fiber on FreeBSD i386.
preparing in case there is more architectures especially the not tested.
1 parent 0430e76 commit be53e5e

File tree

2 files changed

+13
-0
lines changed

2 files changed

+13
-0
lines changed

NEWS

+3
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,9 @@ PHP NEWS
22
|||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||
33
?? ??? ????, PHP 8.1.12
44

5+
- Core:
6+
. Fixes segfault with Fiber on FreeBSD i386 architecture. (David Carlier)
7+
58
- Fileinfo:
69
. Fixed bug GH-8805 (finfo returns wrong mime type for woff/woff2 files).
710
(Anatol)

configure.ac

+10
Original file line numberDiff line numberDiff line change
@@ -1211,6 +1211,7 @@ AS_CASE([$host_cpu],
12111211
AS_CASE([$host_os],
12121212
[darwin*], [fiber_os="mac"],
12131213
[aix*|os400*], [fiber_os="aix"],
1214+
[freebsd*], [fiber_os="freebsd"],
12141215
[fiber_os="other"]
12151216
)
12161217

@@ -1234,6 +1235,15 @@ elif test "$fiber_os" = 'aix'; then
12341235
# AIX uses a different calling convention (shared with non-_CALL_ELF Linux).
12351236
# The AIX assembler isn't GNU, but the file is compatible.
12361237
fiber_asm_file="${fiber_asm_file_prefix}_xcoff_gas"
1238+
elif test "$fiber_os" = 'freebsd'; then
1239+
case $fiber_cpu in
1240+
i386*)
1241+
fiber_asm="no"
1242+
;;
1243+
*)
1244+
fiber_asm_file="${fiber_asm_file_prefix}_elf_gas"
1245+
;;
1246+
esac
12371247
elif test "$fiber_asm_file_prefix" != 'unknown'; then
12381248
fiber_asm_file="${fiber_asm_file_prefix}_elf_gas"
12391249
else

0 commit comments

Comments
 (0)