Gentoo Archives: gentoo-commits

From: Andreas Sturmlechner <asturm@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] repo/gentoo:master commit in: dev-libs/libatomic_ops/files/
Date: Sat, 02 Mar 2019 12:38:07
Message-Id: 1551530273.2d64632b2ac6cc4603b87eb45983301dbbb54687.asturm@gentoo
1 commit: 2d64632b2ac6cc4603b87eb45983301dbbb54687
2 Author: Michael Mair-Keimberger <m.mairkeimberger <AT> gmail <DOT> com>
3 AuthorDate: Sat Mar 2 12:01:29 2019 +0000
4 Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
5 CommitDate: Sat Mar 2 12:37:53 2019 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=2d64632b
7
8 dev-libs/libatomic_ops: remove unused patch(es)
9
10 Signed-off-by: Michael Mair-Keimberger <m.mairkeimberger <AT> gmail.com>
11 Closes: https://github.com/gentoo/gentoo/pull/11215
12 Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>
13
14 .../files/libatomic_ops-7.6.4-gcc7.patch | 40 ----------------------
15 1 file changed, 40 deletions(-)
16
17 diff --git a/dev-libs/libatomic_ops/files/libatomic_ops-7.6.4-gcc7.patch b/dev-libs/libatomic_ops/files/libatomic_ops-7.6.4-gcc7.patch
18 deleted file mode 100644
19 index 66cabfa5582..00000000000
20 --- a/dev-libs/libatomic_ops/files/libatomic_ops-7.6.4-gcc7.patch
21 +++ /dev/null
22 @@ -1,40 +0,0 @@
23 -Upstream commit: https://github.com/ivmai/libatomic_ops/commit/759fa976432e4f09b4a436774fff7119da050042
24 -
25 -From 759fa976432e4f09b4a436774fff7119da050042 Mon Sep 17 00:00:00 2001
26 -From: Ivan Maidanski <ivmai@××××.ru>
27 -Date: Thu, 29 Mar 2018 01:42:38 +0300
28 -Subject: [PATCH] Fix 'undefined reference to __atomic_load/store/cas_16' error
29 - (gcc-7/x64)
30 -
31 -Issue #34 (libatomic_ops).
32 -
33 -* src/atomic_ops/sysdeps/gcc/x86.h [!AO_DISABLE_GCC_ATOMICS
34 -&& !__APPLE_CC__ && !__clang__ && AO_GNUC_PREREQ(7, 0)
35 -&& !AO_PREFER_BUILTIN_ATOMICS && !AO_THREAD_SANITIZER
36 -&& !__MINGW32__] (AO_SKIPATOMIC_double_compare_and_swap_ANY,
37 -AO_SKIPATOMIC_DOUBLE_LOAD_STORE_ANY): Define macro; add comment.
38 ----
39 - src/atomic_ops/sysdeps/gcc/x86.h | 10 +++++++++-
40 - 1 file changed, 9 insertions(+), 1 deletion(-)
41 -
42 -diff --git a/src/atomic_ops/sysdeps/gcc/x86.h b/src/atomic_ops/sysdeps/gcc/x86.h
43 -index d7c06c5..b4ca39f 100644
44 ---- a/src/atomic_ops/sysdeps/gcc/x86.h
45 -+++ b/src/atomic_ops/sysdeps/gcc/x86.h
46 -@@ -67,7 +67,15 @@
47 - # define AO_SKIPATOMIC_DOUBLE_LOAD_STORE_ANY
48 - # endif
49 - # endif /* __x86_64__ */
50 --# endif /* __clang__ */
51 -+
52 -+# elif AO_GNUC_PREREQ(7, 0) && !defined(AO_PREFER_BUILTIN_ATOMICS) \
53 -+ && !defined(AO_THREAD_SANITIZER) && !defined(__MINGW32__)
54 -+ /* gcc-7.x/x64 (gcc-7.2, at least) requires -latomic flag in case */
55 -+ /* of double-word atomic operations use (but not in case of TSan). */
56 -+ /* TODO: Revise it for the future gcc-7 releases. */
57 -+# define AO_SKIPATOMIC_double_compare_and_swap_ANY
58 -+# define AO_SKIPATOMIC_DOUBLE_LOAD_STORE_ANY
59 -+# endif /* __GNUC__ && !__clang__ */
60 -
61 - # ifdef AO_SKIPATOMIC_DOUBLE_LOAD_STORE_ANY
62 - # define AO_SKIPATOMIC_double_load