diff options
| author | bors <bors@rust-lang.org> | 2013-08-22 21:06:25 -0700 |
|---|---|---|
| committer | bors <bors@rust-lang.org> | 2013-08-22 21:06:25 -0700 |
| commit | 9e1e15209129dad9d3bba90450a43ffb2505df14 (patch) | |
| tree | 13e3f799277ef2fe51b36dc6f83f989f465c87d0 /src/rt/rust_builtin.cpp | |
| parent | 6f703770410aa6b333978f192ff00f2ce94b0523 (diff) | |
| parent | 651f38258d72742c5961d646f865316f8ea1823c (diff) | |
| download | rust-9e1e15209129dad9d3bba90450a43ffb2505df14.tar.gz rust-9e1e15209129dad9d3bba90450a43ffb2505df14.zip | |
auto merge of #8596 : vadimcn/rust/master, r=alexcrichton
This resolves issue #908. Notable changes: - On Windows, LLVM integrated assembler emits bad stack unwind tables when segmented stacks are enabled. However, unwind info directives in the assembly output are correct, so we generate assembly first and then run it through an external assembler, just like it is already done for Android builds. - Linker is invoked via "g++" command instead of "gcc": g++ passes the appropriate magic parameters to the linker, which ensure correct registration of stack unwind tables in dynamic libraries.
Diffstat (limited to 'src/rt/rust_builtin.cpp')
| -rw-r--r-- | src/rt/rust_builtin.cpp | 4 |
1 files changed, 0 insertions, 4 deletions
diff --git a/src/rt/rust_builtin.cpp b/src/rt/rust_builtin.cpp index c95a4737d17..de86035b632 100644 --- a/src/rt/rust_builtin.cpp +++ b/src/rt/rust_builtin.cpp @@ -559,11 +559,7 @@ rust_try(rust_try_fn f, void *fptr, void *env) { extern "C" CDECL void rust_begin_unwind(uintptr_t token) { -#ifndef __WIN32__ throw token; -#else - abort(); -#endif } extern "C" CDECL uintptr_t |