From 84f4ccb4bcf32c0336a0c7a3a4ba76d90d6dea1b Mon Sep 17 00:00:00 2001
From: Mathieu Desnoyers <mathieu.desnoyers@efficios.com>
Date: Tue, 29 Sep 2015 11:56:28 -0400
Subject: [PATCH] Fix: only define membarrier system call on Linux

Signed-off-by: Mathieu Desnoyers <mathieu.desnoyers@efficios.com>
---
 urcu/arch/aarch64.h | 6 +++---
 urcu/arch/arm.h     | 6 +++---
 urcu/arch/ia64.h    | 6 +++---
 urcu/arch/ppc.h     | 6 +++---
 urcu/arch/s390.h    | 6 +++---
 urcu/arch/tile.h    | 6 +++---
 urcu/arch/x86.h     | 8 +++-----
 7 files changed, 21 insertions(+), 23 deletions(-)

diff --git a/urcu/arch/aarch64.h b/urcu/arch/aarch64.h
index a68813d..d6a1337 100644
--- 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 d7affaa..5cbca7d 100644
--- 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 12834f3..bca007c 100644
--- 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 7e2b621..791529e 100644
--- 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 e71f99e..67461b4 100644
--- 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 94dad40..eae1161 100644
--- 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 b4d3694..aac8ca1 100644
--- 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
-- 
2.34.1