Skip to content

Commit 1413787

Browse files
committed
Merge branch 'PHP-8.2'
* PHP-8.2: On riscv64 require libatomic if actually needed
2 parents 766cac0 + a1043fe commit 1413787

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
@@ -6,6 +6,8 @@ PHP NEWS
66
. Fixed bug GH-11937 (Constant ASTs containing objects). (ilutov)
77
. Introduced Zend guard recursion protection to fix __debugInfo issue.
88
(Jakub Zelenka)
9+
. Fixed bug GH-11790 (On riscv64 require libatomic if actually needed).
10+
(Jeremie Courreges-Anglas)
911

1012
- DOM:
1113
. Fixed GH-11952 (Confusing warning when blocking entity loading via

configure.ac

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

378378
case $host_alias in
379379
riscv64*)
380-
AC_CHECK_LIB(atomic, __atomic_exchange_1, [
381-
PHP_ADD_LIBRARY(atomic)
382-
], [
383-
AC_MSG_ERROR([Problem with enabling atomic. Please check config.log for details.])
384-
])
380+
PHP_CHECK_FUNC(__atomic_exchange_1, atomic)
385381
;;
386382
esac
387383

0 commit comments

Comments
 (0)