remove unused dependency on linux/membarrier.h for intel to fix CI build

add dependency on linux-libc-dev to INSTALL.md for other architectures
apple · Feb 22, 2017 · dea8577 · dea8577
1 parent f66f018
commit dea8577
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 1 deletion.
diff --git a/INSTALL.md b/INSTALL.md
@@ -152,7 +152,7 @@ on Ubuntu; currently supported versions are 14.04, 15.10 and 16.04.
 
 1. The first thing to do is install required packages:
 
-    `sudo apt-get install autoconf libtool pkg-config clang systemtap-sdt-dev libbsd-dev`
+    `sudo apt-get install autoconf libtool pkg-config clang systemtap-sdt-dev libbsd-dev linux-libc-dev`
 
     Note: compiling libdispatch requires clang 3.8 or better and
 the gold linker. If the default clang on your Ubuntu version is

diff --git a/src/shims/lock.h b/src/shims/lock.h
@@ -89,7 +89,9 @@ _dispatch_lock_has_failed_trylock(dispatch_lock lock_value)
 
 #elif defined(__linux__)
 #include <linux/futex.h>
+#if !defined(__x86_64__) && !defined(__i386__)
 #include <linux/membarrier.h>
+#endif
 #include <unistd.h>
 #include <sys/syscall.h>   /* For SYS_xxx definitions */