Skip to content

Commit 430623f

Browse files
committed
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 Signed-off-by: Daniel A. Steffen <[email protected]>
1 parent 27c57a9 commit 430623f

File tree

2 files changed

+3
-8
lines changed

2 files changed

+3
-8
lines changed

INSTALL.md

+1-8
Original file line numberDiff line numberDiff line change
@@ -152,14 +152,7 @@ on Ubuntu; currently supported versions are 14.04, 15.10 and 16.04.
152152
153153
1. The first thing to do is install required packages:
154154
155-
1a. Install build tools and clang compiler.
156-
`sudo apt-get install autoconf libtool pkg-config clang`
157-
158-
1b. Install dtrace (to generate provider.h)
159-
`sudo apt-get install systemtap-sdt-dev`
160-
161-
1c. Install additional libdispatch dependencies
162-
`sudo apt-get install libblocksruntime-dev libbsd-dev`
155+
`sudo apt-get install autoconf libtool pkg-config clang systemtap-sdt-dev libbsd-dev linux-libc-dev`
163156
164157
Note: compiling libdispatch requires clang 3.8 or better and
165158
the gold linker. If the default clang on your Ubuntu version is

src/shims/lock.h

+2
Original file line numberDiff line numberDiff line change
@@ -89,7 +89,9 @@ _dispatch_lock_has_failed_trylock(dispatch_lock lock_value)
8989

9090
#elif defined(__linux__)
9191
#include <linux/futex.h>
92+
#if !defined(__x86_64__) && !defined(__i386__)
9293
#include <linux/membarrier.h>
94+
#endif
9395
#include <unistd.h>
9496
#include <sys/syscall.h> /* For SYS_xxx definitions */
9597

0 commit comments

Comments
 (0)