Merge pull request #222 from apple/das-disable-linux-membarrier-include-3.1
Swift 3.1: remove unused dependency on linux/membarrier.h for intel to fix CI build
diff --git a/INSTALL.md b/INSTALL.md
index 42675d1..3ab606b 100644
--- a/INSTALL.md
+++ b/INSTALL.md
@@ -152,7 +152,7 @@
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
index 22382cf..a22517e 100644
--- a/src/shims/lock.h
+++ b/src/shims/lock.h
@@ -89,7 +89,9 @@
#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 */
