Skip to content

Commit 9f4e5b6

Browse files
committed
auto merge of #11761 : alexcrichton/rust/epoll-eintr, r=alexcrichton
2 parents 657e353 + be6fb8f commit 9f4e5b6

File tree

4 files changed

+4
-3
lines changed

4 files changed

+4
-3
lines changed

Makefile.in

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -367,7 +367,7 @@ LLVM_COMPONENTS=x86 arm mips ipo bitreader bitwriter linker asmparser jit mcjit
367367
interpreter instrumentation
368368

369369
# Only build these LLVM tools
370-
LLVM_TOOLS=bugpoint llc llvm-ar llvm-as llvm-dis llvm-mc opt
370+
LLVM_TOOLS=bugpoint llc llvm-ar llvm-as llvm-dis llvm-mc opt llvm-extract
371371

372372
define DEF_LLVM_VARS
373373
# The configure script defines these variables with the target triples

src/libnative/io/timer_timerfd.rs

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -85,6 +85,7 @@ fn helper(input: libc::c_int, messages: Port<Req>) {
8585
events.len() as libc::c_int, -1)
8686
} {
8787
0 => fail!("epoll_wait returned immediately!"),
88+
-1 if os::errno() == libc::EINTR as int => { continue }
8889
-1 => fail!("epoll wait failed: {}", os::last_os_error()),
8990
n => n
9091
};

src/llvm

src/rustllvm/llvm-auto-clean-trigger

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

0 commit comments

Comments
 (0)