From c5a6321bf66a223cef13a420ea344accbb40cd2f Mon Sep 17 00:00:00 2001 From: Marcel Moolenaar Date: Fri, 25 Apr 2008 02:51:08 +0000 Subject: [PATCH] Don't use __sync_fetch_and_add_si(), __sync_bool_compare_and_swap_si() and __sync_bool_compare_and_swap_di() for atomic ops. Those are GCC intrinsincs before GCC-4.1.0. With GCC 4.2.x in the tree, this breaks the build. The glib20 code already has the right intrinsincs, so we can eliminate this patch. Ok'd by: marcus@ --- devel/glib20/files/patch-glib_gatomic.c | 37 ------------------------- 1 file changed, 37 deletions(-) delete mode 100644 devel/glib20/files/patch-glib_gatomic.c diff --git a/devel/glib20/files/patch-glib_gatomic.c b/devel/glib20/files/patch-glib_gatomic.c deleted file mode 100644 index 93b29baddabe..000000000000 --- a/devel/glib20/files/patch-glib_gatomic.c +++ /dev/null @@ -1,37 +0,0 @@ ---- glib/gatomic.c.orig Thu Jul 6 11:21:02 2006 -+++ glib/gatomic.c Thu Jul 6 11:18:48 2006 -@@ -414,14 +414,14 @@ - g_atomic_int_exchange_and_add (volatile gint *atomic, - gint val) - { -- return __sync_fetch_and_add (atomic, val); -+ return __sync_fetch_and_add_si (atomic, val); - } - - void - g_atomic_int_add (volatile gint *atomic, - gint val) - { -- __sync_fetch_and_add (atomic, val); -+ __sync_fetch_and_add_si (atomic, val); - } - - gboolean -@@ -429,7 +429,7 @@ - gint oldval, - gint newval) - { -- return __sync_bool_compare_and_swap (atomic, oldval, newval); -+ return __sync_bool_compare_and_swap_si (atomic, oldval, newval); - } - - gboolean -@@ -437,7 +437,7 @@ - gpointer oldval, - gpointer newval) - { -- return __sync_bool_compare_and_swap ((long *)atomic, -+ return __sync_bool_compare_and_swap_di ((long *)atomic, - (long)oldval, (long)newval); - } -