From f1bc537f089cc8477a9a18db597cb349e1b00e91 Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Sat, 16 Jun 2018 05:02:38 +0100 Subject: gentoo resync : 16.06.2018 --- dev-libs/libatomic_ops/Manifest | 5 -- ...libatomic_ops-1.2-fix-makefile-am-generic.patch | 19 ------- .../files/libatomic_ops-1.2-ppc-asm.patch | 11 ---- .../libatomic_ops-1.2-ppc64-load_acquire.patch | 46 ----------------- .../files/libatomic_ops-1.2-sh4.patch | 59 ---------------------- .../files/libatomic_ops-1.2-x32.patch | 43 ---------------- 6 files changed, 183 deletions(-) delete mode 100644 dev-libs/libatomic_ops/files/libatomic_ops-1.2-fix-makefile-am-generic.patch delete mode 100644 dev-libs/libatomic_ops/files/libatomic_ops-1.2-ppc-asm.patch delete mode 100644 dev-libs/libatomic_ops/files/libatomic_ops-1.2-ppc64-load_acquire.patch delete mode 100644 dev-libs/libatomic_ops/files/libatomic_ops-1.2-sh4.patch delete mode 100644 dev-libs/libatomic_ops/files/libatomic_ops-1.2-x32.patch (limited to 'dev-libs/libatomic_ops') diff --git a/dev-libs/libatomic_ops/Manifest b/dev-libs/libatomic_ops/Manifest index 124865670d61..a367f6cd28fe 100644 --- a/dev-libs/libatomic_ops/Manifest +++ b/dev-libs/libatomic_ops/Manifest @@ -1,8 +1,3 @@ -AUX libatomic_ops-1.2-fix-makefile-am-generic.patch 885 BLAKE2B fb1c39e5cf81f7ca056ce24d580163910bff8a526103e3e59d27f424956277d1b0f1be0c5864f4c9e87a88685956deb815dfaca7b52d814e4a45cbe3d984a3e7 SHA512 042e8f4c136f5c30a6cba856f2d8778881edc8aab53da7ab4d830e5c12c95699fa56cc0eef3d36d84d9bbfa9379c5dfb889fbc17a70353584b15166479fb8fdf -AUX libatomic_ops-1.2-ppc-asm.patch 406 BLAKE2B 9ecaba1e870277f17d019d22c041b0e1f7c537b1345da39583ab133bb6411b4edafa573b87ec4d24559ead547be24af726db56ec05a2dc61eae2681590c82fe1 SHA512 469d4487e206ac79cdd6495435338cd141cebae23115dd40421fad785517ef06181bbaf70e3f211ce06df8eb8ed43d154eb0acb11617a106d600cde9a60fde22 -AUX libatomic_ops-1.2-ppc64-load_acquire.patch 1383 BLAKE2B b98e24388962a96a495caca6c635492582307b00bfcd7abdf0b5f38231d0e7dbbbd700a01b622a9e49920026103b5bb2b143aad6b69e36ffc4c95f5dcfd8d284 SHA512 8847007dba55fb6ee1e849bdd0796b28ae4a5065e3273d71c9586e7232e6b9784f85156639c7f647f8fb29f41c335163d4ca642e95d3f153ec9d12e98c740054 -AUX libatomic_ops-1.2-sh4.patch 1839 BLAKE2B d4bf68112f5422a8da74ded9ee6696eb80ed077f1770028093f18ca97e944be68753b6e19eec5fdb8b49f3ab6b55247c3c3e1e5c7b676dad78f2ab14feb01c6c SHA512 1df158a404b4ab6de593b07017c9d69a2a7d036580a639d3df184181216f8500fae9b52636482504c03456bd51fdc0aa91177742fd36cecbe686e2e22c3c5d5f -AUX libatomic_ops-1.2-x32.patch 1651 BLAKE2B 43f4690942a015f18fa62a745456b26bb13b01c6d991039d04ccb7e6de57a08759d513473ab7e9b33452832f64566c3f733213db035cd84cafca3ae18374b208 SHA512 c85f02e34213b433cde7769ee734ec5b065720cc656bb3cf2581be842ef6160d22ab268323de7736a604aaa002f1ba4b4fed4da918fe8da3aa4a8464943af6bb 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 diff --git a/dev-libs/libatomic_ops/files/libatomic_ops-1.2-fix-makefile-am-generic.patch b/dev-libs/libatomic_ops/files/libatomic_ops-1.2-fix-makefile-am-generic.patch deleted file mode 100644 index 7b1f898ef9b6..000000000000 --- a/dev-libs/libatomic_ops/files/libatomic_ops-1.2-fix-makefile-am-generic.patch +++ /dev/null @@ -1,19 +0,0 @@ -diff -u -r a//doc/Makefile.am b//doc/Makefile.am ---- a//doc/Makefile.am 2005-03-22 00:05:19.000000000 +0200 -+++ b//doc/Makefile.am 2010-04-18 20:08:13.000000000 +0300 -@@ -1,3 +1,3 @@ - # installed documentation - # --dist_pkgdata_DATA=COPYING LICENSING.txt README.txt COPYING README_stack.txt README_malloc.txt README_win32.txt -+dist_pkgdata_DATA=COPYING LICENSING.txt README.txt README_stack.txt README_malloc.txt README_win32.txt -diff -u -r a//src/atomic_ops/sysdeps/Makefile.am b//src/atomic_ops/sysdeps/Makefile.am ---- a//src/atomic_ops/sysdeps/Makefile.am 2005-09-28 02:53:16.000000000 +0300 -+++ b//src/atomic_ops/sysdeps/Makefile.am 2010-04-18 20:04:03.000000000 +0300 -@@ -25,7 +25,6 @@ - README \ - \ - gcc/alpha.h gcc/arm.h gcc/x86.h \ -- gcc/hppa.h gcc/ia64.h \ - gcc/powerpc.h gcc/sparc.h \ - gcc/hppa.h gcc/m68k.h gcc/s390.h \ - gcc/ia64.h gcc/x86_64.h gcc/cris.h \ diff --git a/dev-libs/libatomic_ops/files/libatomic_ops-1.2-ppc-asm.patch b/dev-libs/libatomic_ops/files/libatomic_ops-1.2-ppc-asm.patch deleted file mode 100644 index 41171ed86e69..000000000000 --- a/dev-libs/libatomic_ops/files/libatomic_ops-1.2-ppc-asm.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- src/atomic_ops/sysdeps/gcc/powerpc.h 2006-03-29 09:49:14.000000000 +1100 -+++ src/atomic_ops/sysdeps/gcc/powerpc.h 2007-08-27 10:51:00.000000000 +1000 -@@ -72,7 +72,7 @@ - /* registers. I always got "impossible constraint" when I */ - /* tried the "y" constraint. */ - __asm__ __volatile__ ( -- "lwz %0,%1\n" -+ "lwz%X1 %0,%1\n" - "cmpw cr7,%0,%0\n" - "bne- cr7,1f\n" - "1: isync\n" diff --git a/dev-libs/libatomic_ops/files/libatomic_ops-1.2-ppc64-load_acquire.patch b/dev-libs/libatomic_ops/files/libatomic_ops-1.2-ppc64-load_acquire.patch deleted file mode 100644 index 9b6baa188cf7..000000000000 --- a/dev-libs/libatomic_ops/files/libatomic_ops-1.2-ppc64-load_acquire.patch +++ /dev/null @@ -1,46 +0,0 @@ ---- src/atomic_ops/sysdeps/gcc/powerpc.h.orig 2006-03-28 22:49:14.000000000 +0000 -+++ src/atomic_ops/sysdeps/gcc/powerpc.h 2007-06-08 23:10:07.000000000 +0000 -@@ -63,6 +63,8 @@ - /* seems to be that a data dependent branch followed by an isync is */ - /* cheaper. And the documentation is fairly explicit that this also */ - /* has acquire semantics. */ -+/* ppc64 uses ld not lwz */ -+#if defined(__powerpc64__) || defined(__ppc64__) || defined(__64BIT__) - AO_INLINE AO_t - AO_load_acquire(volatile AO_t *addr) - { -@@ -72,7 +74,7 @@ - /* registers. I always got "impossible constraint" when I */ - /* tried the "y" constraint. */ - __asm__ __volatile__ ( -- "lwz %0,%1\n" -+ "ld %0,%1\n" - "cmpw cr7,%0,%0\n" - "bne- cr7,1f\n" - "1: isync\n" -@@ -80,7 +82,25 @@ - : "m"(*addr) : "memory", "cc"); - return result; - } -+#else -+AO_INLINE AO_t -+AO_load_acquire(volatile AO_t *addr) -+{ -+ AO_t result; - -+ /* FIXME: We should get gcc to allocate one of the condition */ -+ /* registers. I always got "impossible constraint" when I */ -+ /* tried the "y" constraint. */ -+ __asm__ __volatile__ ( -+ "lwz %0,%1\n" -+ "cmpw cr7,%0,%0\n" -+ "bne- cr7,1f\n" -+ "1: isync\n" -+ : "=r" (result) -+ : "m"(*addr) : "memory", "cc"); -+ return result; -+} -+#endif - #define AO_HAVE_load_acquire - - /* We explicitly specify store_release, since it relies */ diff --git a/dev-libs/libatomic_ops/files/libatomic_ops-1.2-sh4.patch b/dev-libs/libatomic_ops/files/libatomic_ops-1.2-sh4.patch deleted file mode 100644 index 4e8dd66a3554..000000000000 --- a/dev-libs/libatomic_ops/files/libatomic_ops-1.2-sh4.patch +++ /dev/null @@ -1,59 +0,0 @@ ---- libatomic_ops/src/atomic_ops.h -+++ libatomic_ops/src/atomic_ops.h -@@ -228,6 +228,10 @@ - # if defined(__cris__) || defined(CRIS) - # include "atomic_ops/sysdeps/gcc/cris.h" - # endif -+# if defined(__sh__) || defined(SH4) -+# include "atomic_ops/sysdeps/gcc/sh.h" -+# define AO_CAN_EMUL_CAS -+# endif /* __sh__ */ - #endif /* __GNUC__ && !AO_USE_PTHREAD_DEFS */ - - #if defined(__INTEL_COMPILER) && !defined(AO_USE_PTHREAD_DEFS) -only in patch2: -unchanged: ---- libatomic_ops/src/atomic_ops/sysdeps/Makefile.am -+++ libatomic_ops/src/atomic_ops/sysdeps/Makefile.am -@@ -29,6 +29,7 @@ - gcc/powerpc.h gcc/sparc.h \ - gcc/hppa.h gcc/m68k.h gcc/s390.h \ - gcc/ia64.h gcc/x86_64.h gcc/cris.h \ -+ gcc/sh.h \ - \ - icc/ia64.h \ - \ ---- libatomic_ops/src/atomic_ops/sysdeps/gcc/sh.h -+++ libatomic_ops/src/atomic_ops/sysdeps/gcc/sh.h -@@ -0,0 +1,31 @@ -+/* -+ * Copyright (c) 2009 by Takashi YOSHII. All rights reserved. -+ * -+ * THIS MATERIAL IS PROVIDED AS IS, WITH ABSOLUTELY NO WARRANTY EXPRESSED -+ * OR IMPLIED. ANY USE IS AT YOUR OWN RISK. -+ * -+ * Permission is hereby granted to use or copy this program -+ * for any purpose, provided the above notices are retained on all copies. -+ * Permission to modify the code and to distribute modified code is granted, -+ * provided the above notices are retained, and a notice that the code was -+ * modified is included with the above copyright notice. -+ */ -+ -+#include "../all_atomic_load_store.h" -+#include "../ordered.h" -+ -+/* sh has tas.b(byte) only */ -+#include "../test_and_set_t_is_char.h" -+ -+AO_INLINE AO_TS_VAL_t -+AO_test_and_set_full(volatile AO_TS_t *addr) -+{ -+ int oldval; -+ __asm__ __volatile__( -+ "tas.b @%1; movt %0" -+ : "=r" (oldval) -+ : "r" (addr) -+ : "t", "memory"); -+ return oldval? AO_TS_CLEAR : AO_TS_SET; -+} -+#define AO_HAVE_test_and_set_full diff --git a/dev-libs/libatomic_ops/files/libatomic_ops-1.2-x32.patch b/dev-libs/libatomic_ops/files/libatomic_ops-1.2-x32.patch deleted file mode 100644 index 2edc6958f360..000000000000 --- a/dev-libs/libatomic_ops/files/libatomic_ops-1.2-x32.patch +++ /dev/null @@ -1,43 +0,0 @@ -http://git.yoctoproject.org/cgit/cgit.cgi/poky/commit/?id=e3a384578f677c05d812d99c2c92aa13670bd06a - -Upstream-Status: Pending - -Remove the `q' suffix on x86-64 atomic instructions. - -We don't need the `q' suffix on x86_64 atomic instructions for AO_t, -which is defined as "unsigned long". "unsigned long" is 32bit for x32 -and 64bit for x86-64. The register operand in x86-64 atomic instructions -is sufficient to properly determine the register size. - -Received this patch from H.J. Lu -Signed-Off-By: Nitin A Kamble 2011/12/02 - ---- libatomic_ops-1.2/src/atomic_ops/sysdeps/gcc/x86_64.h.x32 2005-09-28 17:16:38.000000000 -0700 -+++ libatomic_ops-1.2/src/atomic_ops/sysdeps/gcc/x86_64.h 2011-12-02 09:29:54.265251875 -0800 -@@ -60,7 +60,7 @@ AO_fetch_and_add_full (volatile AO_t *p, - { - AO_t result; - -- __asm__ __volatile__ ("lock; xaddq %0, %1" : -+ __asm__ __volatile__ ("lock; xadd %0, %1" : - "=r" (result), "=m" (*p) : "0" (incr), "m" (*p) - : "memory"); - return result; -@@ -111,7 +111,7 @@ AO_int_fetch_and_add_full (volatile unsi - AO_INLINE void - AO_or_full (volatile AO_t *p, AO_t incr) - { -- __asm__ __volatile__ ("lock; orq %1, %0" : -+ __asm__ __volatile__ ("lock; or %1, %0" : - "=m" (*p) : "r" (incr), "m" (*p) : "memory"); - } - -@@ -136,7 +136,7 @@ AO_compare_and_swap_full(volatile AO_t * - AO_t old, AO_t new_val) - { - char result; -- __asm__ __volatile__("lock; cmpxchgq %3, %0; setz %1" -+ __asm__ __volatile__("lock; cmpxchg %3, %0; setz %1" - : "=m"(*addr), "=q"(result) - : "m"(*addr), "r" (new_val), "a"(old) : "memory"); - return (int) result; -- cgit v1.2.3