gentoo resync : 05.04.2018

3 files changed, 44 insertions, 1 deletions

diff --git a/dev-libs/libatomic_ops/Manifest b/dev-libs/libatomic_ops/Manifest
index bc000a694209..7d0c9d7b195d 100644
--- a/dev-libs/libatomic_ops/Manifest
+++ b/dev-libs/libatomic_ops/Manifest
@@ -6,6 +6,7 @@ AUX libatomic_ops-1.2-x32.patch 1651 BLAKE2B 43f4690942a015f18fa62a745456b26bb13
 AUX libatomic_ops-7.2_alpha4-x32.patch 1644 BLAKE2B 482c7c24651b1eccb928434a51491c0b27fc37f555109500ed5c4b743e652c0be1baf5b3e70b641ad8e3120fc6ae7e6bd2d100babbac041bdab0dc912376216b SHA512 59e148fc48ee15f29aebbe8e100796e0c959e8a21daffd54c9678929123faff3d126ba06132a6b42c64f26f15f63db37add1a062d3d664763104eab2c54ff1c8
 AUX libatomic_ops-7.2_alpha6-x32.patch 1960 BLAKE2B 347cf180b524edaa4c55c1884d33fe9716ea282fb33aaecdaecbbe931d35dc728362ffe2cc4325d730caa40f2bda4f7052a49145f380b13ce2a9d4ecd9537bfe SHA512 6b0dfdcccc51494015b842ef41419f3a6b56c6b60b242bdecd98b5aefbd4039ae43912f1823effab3352ec3566257294ae823febf27b95bed6d3fc2f1097a02d
 AUX libatomic_ops-7.4.0-docs.patch 544 BLAKE2B 1ff5a857607a6b96b819f4958c852a91ad4e24288becf7116ebbc2e436013a238fd31b60845c439ff92618ea8f65e6e94a90fcf1714f07a20a71bdc2fd9c1618 SHA512 1dcabd372e62cf4ced7ba1f2e2dcb3ccd0c2d7d98aa1ac2c2ac20fc141c94e8bda46bf03dee1d6785d8bff510375ab28ecc24983407d62b2960bdb195728ce3a
+AUX libatomic_ops-7.6.4-gcc7.patch 1669 BLAKE2B b37d7940e2a793fcda7f20d509e326fd002260294ae90726a7c23262e97d2f27cf985ce3f2a7e0038441b1d6e2fa39202d800d774d44b8dd69662acc8a35aa7b SHA512 a7e2efa8feb5c8e9f4468f6a74a4191c1e95112a5f646dd9635e76790899504242f94500a1599fa72b781159166b61c39e88da6c01e7febab91afad6f099bcf8
 DIST gc-7.2alpha4.tar.gz 1091329 BLAKE2B fb55adfcd122ec5e695a0ab198a4a9ea816cc036bab297e38270d8f673ec6b5cca49de2b383b0fc9c05bc41a417bbed11bdf19370bfa92ba87f63ac34f119a2d SHA512 79c4439989c181add9b80467b1c19d2b61a5e7c510a84a61ee27017220ef56a2b0f4945a4e850019a6c0fe7a9cb3a982ef656b97d988d8e6f3c3fb8270a3e783
 DIST gc-7.2alpha6.tar.gz 1241386 BLAKE2B 0bb3ce73ebfb91ee5ca3222c1b466d77c37d34466dafff2f16462c567fe89f17a27155ce4c5ffa7caa8eb01bc32b7a93a67e547f0adbe509c42533717ecaadcd SHA512 19e8cbb5d4698998a07725dedc204fd707ef3d47a0184129b418e4da44814f0016a834b6ac3766f754e76376441dfbad4b86e8e1b6ada8446f54e70f590628e4
 DIST gc-7.2d.tar.gz 1263064 BLAKE2B dfc90b7a40418216cac31df790a8868d271b7a363ef55ecd62170983a8926f19af716af57777d94ab0a50f20b1f08b37bbb863d42a63b1f6e8aa49c97b1d29e2 SHA512 5b342754a1efeef0cf78983b7a0e48a36495beac04fc881ab356b26dc153b343e940ec7af070f4fc875be44adc559f7be995919fe9229f68d2e0237cdbeaabcc
@@ -30,5 +31,5 @@ EBUILD libatomic_ops-7.4.4.ebuild 796 BLAKE2B 9e4dc567935a1036a4d08f10efa416ab1c
 EBUILD libatomic_ops-7.4.6.ebuild 659 BLAKE2B e5417d2158a4f43f4f471a4ede787ecbe82c164af9cf0a9cc2a1792d0414a81f6ffa5f72e834f3d75714477edb247a2702bff0f15a6cda7afa647556970cb68c SHA512 24f438b90aad521994e6cdf4ae195b7bd5bbdc65c66d3f49daade0131c69952ffa2538d10acd01b55517dc94057a0704919c172e3adc10ca49fbb598e2976d99
 EBUILD libatomic_ops-7.6.0.ebuild 650 BLAKE2B 097e7ff302e2dea88181cb379246a2eea38bc8e638500b608359f52e00be14acf8fcd532277d41406a877e6988255ca36e3b50adc204fc657da67af7d22792b8 SHA512 1d4d27e888b82f36770c301e7da6d0cde3f22a034139d5ac5d1b2ae85268fe78eb9338992d8144bc90f2f56cf0716e8fd1498af617e0c3d9c780b42585a67e9c
 EBUILD libatomic_ops-7.6.2.ebuild 661 BLAKE2B 1f61944836bc735e327f9086ecc10621ed8e60d2426c086d774db56abcef07cdbf98a4d88aac485bd0ec7aaad585081422a7810a84cb4fb9078159aab82ce26d SHA512 ac75f27f0324f245873d7395fb119242a0d677ce32b5aa9d0b7824305cffd6b5f986a8b5addb7ee6098ae9f795aeb4765157a3a815b810b7d9817a9f348205ad
-EBUILD libatomic_ops-7.6.4.ebuild 739 BLAKE2B b8cc708c2a5eab8306819199a93bf260301dc2f41a5bed2a57cf79ef85a70f351c130b15c834a83f33148a436789fa5620a05f18b2c9ec250f839a6b50f0eef1 SHA512 4bdfd4498362faa295435a3cf0944593d80c60b3d012b85f8dddeffec4e46014b5118712fa5e4b1b5f9a75b7ebd780d4cdc32e9020f7ca562d762152eb6063cc
+EBUILD libatomic_ops-7.6.4.ebuild 782 BLAKE2B 7d6474cf9ad4341ec11982dfeb17973e8a4cb0adeb5ece2ed4546ca38d729f15563511e67ef9576235032fcff512a279e5ccd5d324f94e260fbac6f908832d34 SHA512 b0e6e2d920ce33e984d21e00dee675f1d3f44531cb939987a786dbc73afbc3a74cd0adab67ee9811ba22d89bb6fe739b321ed021f8e4181f0b77023bddefb887
 MISC metadata.xml 347 BLAKE2B c8fa80a777d85e172d52bd7eae6523981b9fcc79fa8d6cb7378960adda45dd6489def86930704bb845e64437ff33b39f5401cda0d11ed021342235c7020759e5 SHA512 7a4acee1ccb58c4694e9100d556046c55f508050f6e09dc3d4dd509db9eb747b94eca152e1e98c2ebacd8b8c9c75c362426ad9545cac490f959ec16464f809e5
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
new file mode 100644
index 000000000000..66cabfa55821
--- /dev/null
+++ b/dev-libs/libatomic_ops/files/libatomic_ops-7.6.4-gcc7.patch
@@ -0,0 +1,40 @@
+Upstream commit: https://github.com/ivmai/libatomic_ops/commit/759fa976432e4f09b4a436774fff7119da050042
+
+From 759fa976432e4f09b4a436774fff7119da050042 Mon Sep 17 00:00:00 2001
+From: Ivan Maidanski <ivmai@mail.ru>
+Date: Thu, 29 Mar 2018 01:42:38 +0300
+Subject: [PATCH] Fix 'undefined reference to __atomic_load/store/cas_16' error
+ (gcc-7/x64)
+
+Issue #34 (libatomic_ops).
+
+* src/atomic_ops/sysdeps/gcc/x86.h [!AO_DISABLE_GCC_ATOMICS
+&& !__APPLE_CC__ && !__clang__ && AO_GNUC_PREREQ(7, 0)
+&& !AO_PREFER_BUILTIN_ATOMICS && !AO_THREAD_SANITIZER
+&& !__MINGW32__] (AO_SKIPATOMIC_double_compare_and_swap_ANY,
+AO_SKIPATOMIC_DOUBLE_LOAD_STORE_ANY): Define macro; add comment.
+---
+ src/atomic_ops/sysdeps/gcc/x86.h | 10 +++++++++-
+ 1 file changed, 9 insertions(+), 1 deletion(-)
+
+diff --git a/src/atomic_ops/sysdeps/gcc/x86.h b/src/atomic_ops/sysdeps/gcc/x86.h
+index d7c06c5..b4ca39f 100644
+--- a/src/atomic_ops/sysdeps/gcc/x86.h
++++ b/src/atomic_ops/sysdeps/gcc/x86.h
+@@ -67,7 +67,15 @@
+ #       define AO_SKIPATOMIC_DOUBLE_LOAD_STORE_ANY
+ #     endif
+ #   endif /* __x86_64__ */
+-# endif /* __clang__ */
++
++# elif AO_GNUC_PREREQ(7, 0) && !defined(AO_PREFER_BUILTIN_ATOMICS) \
++       && !defined(AO_THREAD_SANITIZER) && !defined(__MINGW32__)
++    /* gcc-7.x/x64 (gcc-7.2, at least) requires -latomic flag in case   */
++    /* of double-word atomic operations use (but not in case of TSan).  */
++    /* TODO: Revise it for the future gcc-7 releases. */
++#   define AO_SKIPATOMIC_double_compare_and_swap_ANY
++#   define AO_SKIPATOMIC_DOUBLE_LOAD_STORE_ANY
++# endif /* __GNUC__ && !__clang__ */
+ 
+ # ifdef AO_SKIPATOMIC_DOUBLE_LOAD_STORE_ANY
+ #   define AO_SKIPATOMIC_double_load
diff --git a/dev-libs/libatomic_ops/libatomic_ops-7.6.4.ebuild b/dev-libs/libatomic_ops/libatomic_ops-7.6.4.ebuild
index 8a8152918921..efae3090fbcd 100644
--- a/dev-libs/libatomic_ops/libatomic_ops-7.6.4.ebuild
+++ b/dev-libs/libatomic_ops/libatomic_ops-7.6.4.ebuild
@@ -14,6 +14,8 @@ SLOT="0"
 KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE=""
 
+PATCHES=( "${FILESDIR}"/${P}-gcc7.patch )
+
 multilib_src_configure() {
 	ECONF_SOURCE=${S} econf
 }