X-Git-Url: http://git.liburcu.org/?a=blobdiff_plain;f=compat_arch_x86.c;h=e882a4afe467f511832b4d4e662225b7fd41ca3a;hb=8c43fe7257db4d2d75bbf06066d10a3a414f061e;hp=692417ee5067607293ef3c9129f34f8a8b7bb739;hpb=bf33aaea06cbf8257cc49c38abca6d26c0c31c78;p=urcu.git

diff --git a/compat_arch_x86.c b/compat_arch_x86.c
index 692417e..e882a4a 100644
--- a/compat_arch_x86.c
+++ b/compat_arch_x86.c
@@ -24,7 +24,7 @@
 #include <pthread.h>
 #include <signal.h>
 #include <assert.h>
-#include <urcu/uatomic_arch.h>
+#include <urcu/uatomic.h>
 
 /*
  * It does not really matter if the constructor is called before using
@@ -152,6 +152,7 @@ unsigned long _compat_uatomic_xchg(void *addr, unsigned long _new, int len)
 		 * generate an illegal instruction. Cannot catch this with
 		 * linker tricks when optimizations are disabled.
 		 */
+		retval = 0;	/* silence gcc warnings */
 		__asm__ __volatile__("ud2");
 	}
 	mutex_lock_signal_restore(&compat_mutex, &mask);
@@ -195,6 +196,7 @@ unsigned long _compat_uatomic_cmpxchg(void *addr, unsigned long old,
 		 * generate an illegal instruction. Cannot catch this with
 		 * linker tricks when optimizations are disabled.
 		 */
+		retval = 0;	/* silence gcc warnings */
 		__asm__ __volatile__("ud2");
 	}
 	mutex_lock_signal_restore(&compat_mutex, &mask);
@@ -275,6 +277,7 @@ unsigned long _compat_uatomic_add_return(void *addr, unsigned long v, int len)
 		 * generate an illegal instruction. Cannot catch this with
 		 * linker tricks when optimizations are disabled.
 		 */
+		result = 0;	/* silence gcc warnings */
 		__asm__ __volatile__("ud2");
 	}
 	mutex_lock_signal_restore(&compat_mutex, &mask);