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

4 files changed, 3 insertions, 2 deletions

diff --git a/Makefile.in b/Makefile.in
index 7f1a6945d8a..aab1e2ff556 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -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
diff --git a/src/libnative/io/timer_timerfd.rs b/src/libnative/io/timer_timerfd.rs
index 4912f4f431f..0556b0c2599 100644
--- a/src/libnative/io/timer_timerfd.rs
+++ b/src/libnative/io/timer_timerfd.rs
@@ -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
         };
diff --git a/src/llvm b/src/llvm
-Subproject 8841dcef357e051c34a46030db7c7b1a83f9b1d
+Subproject 535989a92ce1f6f6488c94a2c8f4ed438349f16
diff --git a/src/rustllvm/llvm-auto-clean-trigger b/src/rustllvm/llvm-auto-clean-trigger
index 95b950973d1..96cd67dcec4 100644
--- a/src/rustllvm/llvm-auto-clean-trigger
+++ b/src/rustllvm/llvm-auto-clean-trigger
@@ -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