X-Git-Url: https://git.liburcu.org/?p=urcu.git;a=blobdiff_plain;f=compat_arch_x86.c;h=714201b01b78d9efbfaa110c9e27dfbb6e2a5557;hp=692417ee5067607293ef3c9129f34f8a8b7bb739;hb=9d2614f07691a813a3c560a6c0bcd0a7be854ed5;hpb=bf33aaea06cbf8257cc49c38abca6d26c0c31c78

diff --git a/compat_arch_x86.c b/compat_arch_x86.c
index 692417e..714201b 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
@@ -122,10 +122,11 @@ unsigned long _compat_uatomic_set(void *addr, unsigned long _new, int len)
 		 * generate an illegal instruction. Cannot catch this with
 		 * linker tricks when optimizations are disabled.
 		 */
+		result = 0;
 		__asm__ __volatile__("ud2");
 	}
 	mutex_lock_signal_restore(&compat_mutex, &mask);
-	return _new;
+	return result;
 }
 
 unsigned long _compat_uatomic_xchg(void *addr, unsigned long _new, int len)
@@ -152,6 +153,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 +197,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 +278,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);