Fix: only define membarrier system call on Linux

Signed-off-by: Mathieu Desnoyers <mathieu.desnoyers@efficios.com>

diff --git a/urcu/arch/aarch64.h b/urcu/arch/aarch64.h
index a68813d14cd9074017bde2620a89edac9afa5a83..d6a133758dffca0c22ca5f6e94314c4c6d0d5390 100644 (file)
--- a/urcu/arch/aarch64.h
+++ b/urcu/arch/aarch64.h
@@ -34,11 +34,11 @@ extern "C" {
 #include <sys/time.h>
 
 /*
- * Define the membarrier system call number if not yet available in the
- * system headers. aarch64 implements asm-generic/unistd.h system call
+ * On Linux, define the membarrier system call number if not yet available in
+ * the system headers. aarch64 implements asm-generic/unistd.h system call
  * numbers.
  */
-#ifndef __NR_membarrier
+#if (defined(__linux__) && !defined(__NR_membarrier))
 #define __NR_membarrier                283
 #endif
 

diff --git a/urcu/arch/arm.h b/urcu/arch/arm.h
index d7affaabe85685b6c62929073e7baa732ef69a1d..5cbca7d7f1d0d523186b40837ce93ff515615128 100644 (file)
--- a/urcu/arch/arm.h
+++ b/urcu/arch/arm.h
@@ -40,10 +40,10 @@ extern "C" {
 #include <sys/time.h>
 
 /*
- * Define the membarrier system call number if not yet available in the
- * system headers.
+ * On Linux, define the membarrier system call number if not yet available in
+ * the system headers.
  */
-#ifndef __NR_membarrier
+#if (defined(__linux__) && !defined(__NR_membarrier))
 #define __NR_membarrier                389
 #endif
 

diff --git a/urcu/arch/ia64.h b/urcu/arch/ia64.h
index 12834f36f1f7cbf673f2d52b47ef1cbb6c3a4806..bca007cf0301f0fc0d01ef5adb7635be433fa7aa 100644 (file)
--- a/urcu/arch/ia64.h
+++ b/urcu/arch/ia64.h
@@ -34,10 +34,10 @@ extern "C" {
 #include <sys/time.h>
 
 /*
- * Define the membarrier system call number if not yet available in the
- * system headers.
+ * On Linux, define the membarrier system call number if not yet available in
+ * the system headers.
  */
-#ifndef __NR_membarrier
+#if (defined(__linux__) && !defined(__NR_membarrier))
 #define __NR_membarrier                1344
 #endif
 

diff --git a/urcu/arch/ppc.h b/urcu/arch/ppc.h
index 7e2b6218f82ddc4808a775010c8bfd0c6e25ea5c..791529ebb1a08ff3db124103474522b77bf0ad15 100644 (file)
--- a/urcu/arch/ppc.h
+++ b/urcu/arch/ppc.h
@@ -109,10 +109,10 @@ static inline caa_cycles_t caa_get_cycles(void)
 #endif
 
 /*
- * Define the membarrier system call number if not yet available in the
- * system headers.
+ * On Linux, define the membarrier system call number if not yet available in
+ * the system headers.
  */
-#ifndef __NR_membarrier
+#if (defined(__linux__) && !defined(__NR_membarrier))
 #define __NR_membarrier                365
 #endif
 

diff --git a/urcu/arch/s390.h b/urcu/arch/s390.h
index e71f99ec483d447e9bcdb7fa2ac1dd8ef82d5b69..67461b4d6ed1c3f6ac258b0e636a6939fd942871 100644 (file)
--- a/urcu/arch/s390.h
+++ b/urcu/arch/s390.h
@@ -55,10 +55,10 @@ static inline caa_cycles_t caa_get_cycles (void)
 }
 
 /*
- * Define the membarrier system call number if not yet available in the
- * system headers.
+ * On Linux, define the membarrier system call number if not yet available in
+ * the system headers.
  */
-#ifndef __NR_membarrier
+#if (defined(__linux__) && !defined(__NR_membarrier))
 #define __NR_membarrier                356
 #endif
 

diff --git a/urcu/arch/tile.h b/urcu/arch/tile.h
index 94dad4057b963c9ce7ef63d32baa9ce065311a64..eae1161f2203340cc96e764d2298de5983af6450 100644 (file)
--- a/urcu/arch/tile.h
+++ b/urcu/arch/tile.h
@@ -34,11 +34,11 @@ extern "C" {
 #include <sys/time.h>
 
 /*
- * Define the membarrier system call number if not yet available in the
- * system headers. tile implements asm-generic/unistd.h system call
+ * On Linux, define the membarrier system call number if not yet available in
+ * the system headers. tile implements asm-generic/unistd.h system call
  * numbers.
  */
-#ifndef __NR_membarrier
+#if (defined(__linux__) && !defined(__NR_membarrier))
 #define __NR_membarrier                283
 #endif
 

diff --git a/urcu/arch/x86.h b/urcu/arch/x86.h
index b4d3694fdffb896fa3773f30ad8d0777ae9836a4..aac8ca1384b63f4ce321680cffbcaca661a0f16c 100644 (file)
--- a/urcu/arch/x86.h
+++ b/urcu/arch/x86.h
@@ -91,15 +91,13 @@ static inline caa_cycles_t caa_get_cycles(void)
 }
 
 /*
- * Define the membarrier system call number if not yet available in the
- * system headers.
+ * On Linux, define the membarrier system call number if not yet available in
+ * the system headers.
  */
+#if (defined(__linux__) && !defined(__NR_membarrier))
 #if (CAA_BITS_PER_LONG == 32)
-#ifndef __NR_membarrier
 #define __NR_membarrier                375
-#endif
 #else
-#ifndef __NR_membarrier
 #define __NR_membarrier                324
 #endif
 #endif