From 84403eb89778df6aebd6269e354b136bd00fc08e Mon Sep 17 00:00:00 2001
From: Luqman Aden <laden@csclub.uwaterloo.ca>
Date: Fri, 22 Nov 2013 21:21:37 -0500
Subject: Remove sjlj stuff from rust_upcall and don't pass -Werror to libuv.

---
 src/rt/rust_upcall.c | 10 ----------
 src/rt/rustrt.def.in |  1 -
 2 files changed, 11 deletions(-)

(limited to 'src')

diff --git a/src/rt/rust_upcall.c b/src/rt/rust_upcall.c
index bda0898ca5c..9740fdea82c 100644
--- a/src/rt/rust_upcall.c
+++ b/src/rt/rust_upcall.c
@@ -35,16 +35,6 @@ struct _Unwind_Exception;
 #   endif
 #endif
 
-#if __USING_SJLJ_EXCEPTIONS__
-void _Unwind_SjLj_Resume(struct _Unwind_Exception* exception_object);
-
-void _Unwind_Resume(struct _Unwind_Exception* exception_object) {
-    _Unwind_SjLj_Resume(exception_object);
-}
-#else
-extern void _Unnwind_Resume(struct _Unwind_Exception* exception_object);
-#endif
-
 _Unwind_Reason_Code
 PERSONALITY_FUNC(int version,
                      _Unwind_Action actions,
diff --git a/src/rt/rustrt.def.in b/src/rt/rustrt.def.in
index 53ce2067421..2a3e687ee55 100644
--- a/src/rt/rustrt.def.in
+++ b/src/rt/rustrt.def.in
@@ -49,4 +49,3 @@ rust_get_test_int
 rust_pthread_mutex_t_size
 rust_pthread_cond_t_size
 rust_crit_section_size
-_Unwind_Resume
-- 
cgit 1.4.1-3-g733a5