1
Fork 0

auto merge of #11761 : alexcrichton/rust/epoll-eintr, r=alexcrichton

This commit is contained in:
bors 2014-01-23 15:36:56 -08:00
commit 9f4e5b6f31
4 changed files with 4 additions and 3 deletions

View file

@ -367,7 +367,7 @@ LLVM_COMPONENTS=x86 arm mips ipo bitreader bitwriter linker asmparser jit mcjit
interpreter instrumentation
# Only build these LLVM tools
LLVM_TOOLS=bugpoint llc llvm-ar llvm-as llvm-dis llvm-mc opt
LLVM_TOOLS=bugpoint llc llvm-ar llvm-as llvm-dis llvm-mc opt llvm-extract
define DEF_LLVM_VARS
# The configure script defines these variables with the target triples

View file

@ -85,6 +85,7 @@ fn helper(input: libc::c_int, messages: Port<Req>) {
events.len() as libc::c_int, -1)
} {
0 => fail!("epoll_wait returned immediately!"),
-1 if os::errno() == libc::EINTR as int => { continue }
-1 => fail!("epoll wait failed: {}", os::last_os_error()),
n => n
};

@ -1 +1 @@
Subproject commit 8841dcef357e051c34a46030db7c7b1a83f9b1d8
Subproject commit 535989a92ce1f6f6488c94a2c8f4ed438349f162

View file

@ -1,4 +1,4 @@
# If this file is modified, then llvm will be forcibly cleaned and then rebuilt.
# The actual contents of this file do not matter, but to trigger a change on the
# build bots then the contents should be changed so git updates the mtime.
2013-12-29
2014-01-22