Merge branch 'PHP-8.1' into PHP-8.2

* PHP-8.1:
  On riscv64 require libatomic if actually needed
This commit is contained in:
Peter Kokot 2023-08-28 19:47:44 +02:00
commit a1043fe051
2 changed files with 3 additions and 5 deletions

2
NEWS
View File

@ -4,6 +4,8 @@ PHP NEWS
- Core:
. Fixed bug GH-11937 (Constant ASTs containing objects). (ilutov)
. Fixed bug GH-11790 (On riscv64 require libatomic if actually needed).
(Jeremie Courreges-Anglas)
- DOM:
. Fix memory leak when setting an invalid DOMDocument encoding. (nielsdos)

View File

@ -375,11 +375,7 @@ AC_CHECK_LIB(m, sin)
case $host_alias in
riscv64*)
AC_CHECK_LIB(atomic, __atomic_exchange_1, [
PHP_ADD_LIBRARY(atomic)
], [
AC_MSG_ERROR([Problem with enabling atomic. Please check config.log for details.])
])
PHP_CHECK_FUNC(__atomic_exchange_1, atomic)
;;
esac