jcgruenhage/void-packages
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

apr: use __atomic instead of __sync for builtins for 64-bit atomics

Browse source 
This allows us to use libatomic on architectures without native
support, unlike __sync.
This commit is contained in:
q66 2020-01-10 17:39:06 +01:00
parent ccf3e8e0d1
commit 8e41df8389
2 changed files with 65 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

56
srcpkgs/apr/patches/atomic64.patch Normal file
View file

@ -0,0 +1,56 @@
commit 69e9378eb86357d4361322256d5d5a39ff4a592d
Author: q66 <daniel@octaforge.org>
Date: Fri Jan 10 13:04:37 2020 +0100
use __atomic builtins instead of legacy __sync
This allows for 64-bit atomic ops on platforms that don't natively
support them such as armv6 and ppc32.
diff --git atomic/unix/builtins64.c atomic/unix/builtins64.c
index 4a4b685..90b5c5e 100644
--- atomic/unix/builtins64.c
+++ atomic/unix/builtins64.c
@@ -30,35 +30,34 @@ APR_DECLARE(void) apr_atomic_set64(volatile apr_uint64_t *mem, apr_uint64_t val)
APR_DECLARE(apr_uint64_t) apr_atomic_add64(volatile apr_uint64_t *mem, apr_uint64_t val)
{
- return __sync_fetch_and_add(mem, val);
+ return __atomic_fetch_add(mem, val, __ATOMIC_SEQ_CST);
}
APR_DECLARE(void) apr_atomic_sub64(volatile apr_uint64_t *mem, apr_uint64_t val)
{
- __sync_fetch_and_sub(mem, val);
+ __atomic_fetch_sub(mem, val, __ATOMIC_SEQ_CST);
}
APR_DECLARE(apr_uint64_t) apr_atomic_inc64(volatile apr_uint64_t *mem)
{
- return __sync_fetch_and_add(mem, 1);
+ return __atomic_fetch_add(mem, 1, __ATOMIC_SEQ_CST);
}
APR_DECLARE(int) apr_atomic_dec64(volatile apr_uint64_t *mem)
{
- return __sync_sub_and_fetch(mem, 1);
+ return (int)__atomic_sub_fetch(mem, 1, __ATOMIC_SEQ_CST);
}
APR_DECLARE(apr_uint64_t) apr_atomic_cas64(volatile apr_uint64_t *mem, apr_uint64_t with,
apr_uint64_t cmp)
{
- return __sync_val_compare_and_swap(mem, cmp, with);
+ __atomic_compare_exchange_n(mem, &cmp, with, 0, __ATOMIC_SEQ_CST, __ATOMIC_SEQ_CST);
+ return cmp;
}
APR_DECLARE(apr_uint64_t) apr_atomic_xchg64(volatile apr_uint64_t *mem, apr_uint64_t val)
{
- __sync_synchronize();
-
- return __sync_lock_test_and_set(mem, val);
+ return __atomic_exchange_n(mem, val, __ATOMIC_SEQ_CST);
}
#endif /* USE_ATOMICS_BUILTINS */

10
srcpkgs/apr/template
View file

@ -1,7 +1,7 @@
# Template file for 'apr' # Template file for 'apr'
pkgname=apr pkgname=apr
version=1.7.0 version=1.7.0
revision=1 revision=2
build_style=gnu-configure build_style=gnu-configure
configure_args="--with-installbuilddir=/usr/share/apr-1/build" configure_args="--with-installbuilddir=/usr/share/apr-1/build"
makedepends="expat-devel libuuid-devel" makedepends="expat-devel libuuid-devel"
@ -22,6 +22,14 @@ if [ "$CROSS_BUILD" ]; then
configure_args+=" apr_cv_mutex_robust_shared=yes" configure_args+=" apr_cv_mutex_robust_shared=yes"
fi fi
case "$XBPS_TARGET_MACHINE" in
ppc64*) ;;
ppc*|armv[56]*|mips*)
makedepends+=" libatomic-devel"
LDFLAGS="-latomic"
;;
esac
pre_build() { pre_build() {
if [ "$CROSS_BUILD" ]; then if [ "$CROSS_BUILD" ]; then
sed -i "/LINK_PROG.*OBJECTS_gen_test_char/s|.*|\t${BUILD_CC} ${BUILD_CFLAGS} tools/gen_test_char.c -o tools/gen_test_char|" Makefile sed -i "/LINK_PROG.*OBJECTS_gen_test_char/s|.*|\t${BUILD_CC} ${BUILD_CFLAGS} tools/gen_test_char.c -o tools/gen_test_char|" Makefile