diff --git a/aarch64-gcc5.patch b/aarch64-gcc5.patch deleted file mode 100644 index 95751c9..0000000 --- a/aarch64-gcc5.patch +++ /dev/null @@ -1,41 +0,0 @@ -From 437c10b73ae4b83306f77c851cf8385172ae3759 Mon Sep 17 00:00:00 2001 -From: Frank Schaefer -Date: Tue, 9 Jun 2015 17:10:00 -0500 -Subject: [PATCH] Fix GCC 5.x compatibility for AArch64 double-wide primitives - -Small change to make aarch64 support work with gcc 5.x. Otherwise it -demands gcc -latomic and still fails test_stack. - -* src/atomic_ops/sysdeps/gcc/aarch64.h (AO_double_load, -AO_double_load_acquire, AO_double_store, AO_double_store_release, -AO_double_compare_and_swap, AO_double_compare_and_swap_acquire, -AO_double_compare_and_swap_release, AO_double_compare_and_swap_full): -Use assembly implementation even for GCC v5+ (not just GCC 4.x). ---- - src/atomic_ops/sysdeps/gcc/aarch64.h | 4 ++-- - 1 file changed, 2 insertions(+), 2 deletions(-) - -diff --git a/src/atomic_ops/sysdeps/gcc/aarch64.h b/src/atomic_ops/sysdeps/gcc/aarch64.h -index f969f13..b7f2ef0 100644 ---- a/src/atomic_ops/sysdeps/gcc/aarch64.h -+++ b/src/atomic_ops/sysdeps/gcc/aarch64.h -@@ -30,7 +30,7 @@ - #endif - - /* TODO: Adjust version check on fixing double-wide AO support in GCC. */ --#if __GNUC__ == 4 -+#if __GNUC__ >= 4 - - AO_INLINE AO_double_t - AO_double_load(const volatile AO_double_t *addr) -@@ -195,6 +195,6 @@ - return !result; - } - # define AO_HAVE_double_compare_and_swap_full --#endif /* __GNUC__ == 4 */ -+#endif /* __GNUC__ >= 4 */ - - #include "generic.h" --- -2.8.0 - diff --git a/libatomic_ops-7.4.2.tar.gz b/libatomic_ops-7.4.2.tar.gz deleted file mode 100644 index eac0f4e..0000000 --- a/libatomic_ops-7.4.2.tar.gz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:04fa615f62992547bcbda562260e28b504bc4c06e2f985f267f3ade30304b5dd -size 465710 diff --git a/libatomic_ops-7.6.2.tar.gz b/libatomic_ops-7.6.2.tar.gz new file mode 100644 index 0000000..4280fb0 --- /dev/null +++ b/libatomic_ops-7.6.2.tar.gz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:219724edad3d580d4d37b22e1d7cb52f0006d282d26a9b8681b560a625142ee6 +size 496917 diff --git a/libatomic_ops.changes b/libatomic_ops.changes index d7740f5..393b5eb 100644 --- a/libatomic_ops.changes +++ b/libatomic_ops.changes @@ -1,3 +1,31 @@ +------------------------------------------------------------------- +Mon Jan 29 11:04:41 UTC 2018 - jengelh@inai.de + +- Update to new upstream release 7.6.2 + * Fix GCC 5.x compatibility for AArch64 double-wide primitives + * Implement fetch-CAS for s390[x] (gcc) + * Support n32 ABI for mips64 + * Use LLD and SCD instructions on mips64 + * Use generalized double-wide load/store if + AO_PREFER_GENERALIZED (gcc/x86) + * Use GCC atomic intrinsics for PowerPC 32/64 (GCC 4.8+ and + clang 3.8+) + * Use GCC atomic intrinsics for x86, x64, ARM, MIPS (gcc 4.9+, + clang 3.5+) + * Relax shareability domain for dmb st in AO_nop_write + (ARM/AArch64) + * Implement AO_CLEAR using C11 atomic intrinsic (GCC) + * Implement CAS_acquire/release/full using + __atomic_compare_exchange_n (gcc) + * Implement compiler_barrier using C11 __atomic_signal_fence + (GCC) + * Add initial nios2 architecture support + * Add asm-based and/or/xor implementation for char/short/int + (gcc/x86) + * Add asm-based char/short/int CAS implementation for + gcc/x86[_64] +- Remove aarch64-gcc5.patch (no longer applies) + ------------------------------------------------------------------- Thu Apr 7 12:26:58 UTC 2016 - schwab@suse.de diff --git a/libatomic_ops.spec b/libatomic_ops.spec index d8807bc..58a2b25 100644 --- a/libatomic_ops.spec +++ b/libatomic_ops.spec @@ -1,7 +1,7 @@ # # spec file for package libatomic_ops # -# Copyright (c) 2016 SUSE LINUX GmbH, Nuernberg, Germany. +# Copyright (c) 2018 SUSE LINUX GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -17,7 +17,7 @@ Name: libatomic_ops -Version: 7.4.2 +Version: 7.6.2 Release: 0 Summary: A portable library for atomic memory operations License: GPL-2.0+ and MIT @@ -26,13 +26,11 @@ Url: https://github.com/ivmai/libatomic_ops #Git-Clone: git://github.com/ivmai/libatomic_ops Source: http://www.ivmaisoft.com/_bin/atomic_ops/%name-%version.tar.gz -Patch2: libatomic_ops-ppc64.patch -Patch3: aarch64-gcc5.patch +Patch1: libatomic_ops-ppc64.patch BuildRequires: autoconf BuildRequires: automake BuildRequires: libtool BuildRequires: pkg-config -BuildRoot: %{_tmppath}/%{name}-%{version}-build %description Provides implementations for atomic memory update operations on a @@ -44,8 +42,8 @@ that involves minimum overhead across a variety of architectures. %package devel Summary: A portable library for atomic memory operations Group: Development/Languages/C and C++ -Obsoletes: libatomic-ops-devel < %{version}-%{release} -Provides: libatomic-ops-devel = %{version}-%{release} +Obsoletes: libatomic-ops-devel < %version-%release +Provides: libatomic-ops-devel = %version-%release %description devel Provides implementations for atomic memory update operations on a @@ -56,19 +54,17 @@ that involves minimum overhead across a variety of architectures. %prep %setup -q -%patch2 -p1 -%patch3 -p1 +%patch -P 1 -p1 %build -autoreconf -fvi -%configure +autoreconf -fiv +%configure --docdir="%_docdir/%name" make %{?_smp_mflags} %install %make_install rm -f "%buildroot/%_libdir"/*.la -# remove unnecessary documents -rm -Rf "%{buildroot}/%{_datadir}/libatomic_ops" +cp -a ChangeLog "%buildroot/%_docdir/%name/" %check %if !0%{?qemu_user_space_build:1} @@ -77,11 +73,10 @@ make check %{?_smp_mflags} %files devel %defattr(-,root,root) -%doc README.md COPYING AUTHORS ChangeLog -%doc doc/*.txt -%{_libdir}/libatomic_ops*.a -%{_includedir}/atomic_ops/ -%{_includedir}/atomic_ops*.h -%{_libdir}/pkgconfig/atomic_ops.pc +%_libdir/libatomic_ops*.a +%_includedir/atomic_ops/ +%_includedir/atomic_ops*.h +%_libdir/pkgconfig/atomic_ops.pc +%_docdir/%name/ %changelog