1
0
mirror of https://github.com/php/php-src.git synced 2026-03-24 00:02:20 +01:00

Merge branch 'PHP-8.2'

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

2
NEWS
View File

@@ -6,6 +6,8 @@ PHP NEWS
. Fixed bug GH-11937 (Constant ASTs containing objects). (ilutov)
. Introduced Zend guard recursion protection to fix __debugInfo issue.
(Jakub Zelenka)
. Fixed bug GH-11790 (On riscv64 require libatomic if actually needed).
(Jeremie Courreges-Anglas)
- DOM:
. Fixed GH-11952 (Confusing warning when blocking entity loading via

View File

@@ -377,11 +377,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