Skip to content

Swift 3.1: remove unused dependency on linux/membarrier.h for intel to fix CI build #222

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Feb 22, 2017
Merged

Swift 3.1: remove unused dependency on linux/membarrier.h for intel to fix CI build #222

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion INSTALL.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 2 additions & 0 deletions src/shims/lock.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 */

Expand Down