From aa78da3f45486bb6ef336f044b47072e99c595d2 Mon Sep 17 00:00:00 2001 From: Alex Crichton Date: Thu, 23 Jan 2014 12:33:34 -0800 Subject: Handle EINTR in epoll for native timers --- src/libnative/io/timer_timerfd.rs | 1 + 1 file changed, 1 insertion(+) (limited to 'src') 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) { 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 }; -- cgit 1.4.1-3-g733a5 From 219478fb41bfc49cc52ace67a9e59470162f7bcc Mon Sep 17 00:00:00 2001 From: Alex Crichton Date: Thu, 23 Jan 2014 15:11:53 -0800 Subject: Build llvm-extract (needed by codegen tests) --- Makefile.in | 2 +- src/rustllvm/llvm-auto-clean-trigger | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) (limited to 'src') 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/rustllvm/llvm-auto-clean-trigger b/src/rustllvm/llvm-auto-clean-trigger index 95b950973d1..da3fd879083 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-21 -- cgit 1.4.1-3-g733a5 From be6fb8f2cd5f5c53a2e45dfe1289cf18d40b76e2 Mon Sep 17 00:00:00 2001 From: "aydin.kim" Date: Thu, 23 Jan 2014 14:23:39 +0900 Subject: update llvm --- src/llvm | 2 +- src/rustllvm/llvm-auto-clean-trigger | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) (limited to 'src') diff --git a/src/llvm b/src/llvm index 8841dcef357..535989a92ce 160000 --- a/src/llvm +++ b/src/llvm @@ -1 +1 @@ -Subproject commit 8841dcef357e051c34a46030db7c7b1a83f9b1d8 +Subproject commit 535989a92ce1f6f6488c94a2c8f4ed438349f162 diff --git a/src/rustllvm/llvm-auto-clean-trigger b/src/rustllvm/llvm-auto-clean-trigger index da3fd879083..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. -2014-01-21 +2014-01-22 -- cgit 1.4.1-3-g733a5