[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]

rpms/glib2/devel glib-2.7.6-atomic.patch,1.2,1.3



Author: mclasen

Update of /cvs/dist/rpms/glib2/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv2369

Modified Files:
	glib-2.7.6-atomic.patch 
Log Message:
Another attempt to fix s390 atomic ops and ABI


glib-2.7.6-atomic.patch:
 gatomic.c    |   18 ++++++++++++++++--
 glib.symbols |    2 --
 2 files changed, 16 insertions(+), 4 deletions(-)

Index: glib-2.7.6-atomic.patch
===================================================================
RCS file: /cvs/dist/rpms/glib2/devel/glib-2.7.6-atomic.patch,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- glib-2.7.6-atomic.patch	4 Aug 2005 14:34:10 -0000	1.2
+++ glib-2.7.6-atomic.patch	4 Aug 2005 14:45:07 -0000	1.3
@@ -1,5 +1,5 @@
 --- glib-2.7.6/glib/gatomic.c.atomic	2005-08-04 10:33:14.000000000 -0400
-+++ glib-2.7.6/glib/gatomic.c	2005-08-04 10:33:45.000000000 -0400
++++ glib-2.7.6/glib/gatomic.c	2005-08-04 10:43:47.000000000 -0400
 @@ -464,7 +464,7 @@
    __asm__ __volatile__ ("cs %0, %2, %1"
  			: "+d" (result), "=Q" (*(atomic))
@@ -18,3 +18,38 @@
  }
  #  else /* What's that */
  #    error "Your system has an unsupported pointer size"
+@@ -687,5 +687,19 @@
+ #endif /* DEFINE_WITH_MUTEXES */
+ }
+ 
++#ifndef G_ATOMIC_OP_MEMORY_BARRIER_NEEDED
++gint
++(g_atomic_int_get) (gint *atomic)
++{
++  return g_atomic_int_get (atomic);
++}
++
++gint
++(g_atomic_pointer_get) (gint *atomic)
++{
++  return g_atomic_pointer_get (atomic);
++}
++#endif /* G_ATOMIC_OP_MEMORY_BARRIER_NEEDED */
++
+ #define __G_ATOMIC_C__
+ #include "galiasdef.c"
+--- glib-2.7.6/glib/glib.symbols.atomic	2005-08-04 10:44:24.000000000 -0400
++++ glib-2.7.6/glib/glib.symbols	2005-08-04 10:44:31.000000000 -0400
+@@ -82,12 +82,10 @@
+ g_atomic_int_compare_and_exchange
+ g_atomic_int_exchange_and_add
+ g_atomic_pointer_compare_and_exchange
+-#ifdef G_ATOMIC_OP_MEMORY_BARRIER_NEEDED
+ g_atomic_int_get
+ g_atomic_pointer_get
+ #endif
+ #endif
+-#endif
+ 
+ #if IN_HEADER(__G_BACKTRACE_H__)
+ #if IN_FILE(__G_BACKTRACE_C__)


[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]