Skip to content

Commit a1043fe

Browse files
committed
Merge branch 'PHP-8.1' into PHP-8.2
* PHP-8.1: On riscv64 require libatomic if actually needed
2 parents c128dbd + bf3fb4e commit a1043fe

File tree

2 files changed

+3
-5
lines changed

2 files changed

+3
-5
lines changed

NEWS

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,8 @@ PHP NEWS
44

55
- Core:
66
. Fixed bug GH-11937 (Constant ASTs containing objects). (ilutov)
7+
. Fixed bug GH-11790 (On riscv64 require libatomic if actually needed).
8+
(Jeremie Courreges-Anglas)
79

810
- DOM:
911
. Fix memory leak when setting an invalid DOMDocument encoding. (nielsdos)

configure.ac

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -375,11 +375,7 @@ AC_CHECK_LIB(m, sin)
375375

376376
case $host_alias in
377377
riscv64*)
378-
AC_CHECK_LIB(atomic, __atomic_exchange_1, [
379-
PHP_ADD_LIBRARY(atomic)
380-
], [
381-
AC_MSG_ERROR([Problem with enabling atomic. Please check config.log for details.])
382-
])
378+
PHP_CHECK_FUNC(__atomic_exchange_1, atomic)
383379
;;
384380
esac
385381

0 commit comments

Comments
 (0)