2 files changed, 35 insertions, 3 deletions

diff --git a/src/comp/back/x86.rs b/src/comp/back/x86.rs
index e35af621..09b18309 100644
--- a/src/comp/back/x86.rs
+++ b/src/comp/back/x86.rs
@@ -11,6 +11,14 @@ fn wstr(int i) -> str {
     ret istr(i * wordsz);
 }
 
+fn start() -> vec[str] {
+    ret vec(".cfi_startproc");
+}
+
+fn end() -> vec[str] {
+    ret vec(".cfi_endproc");
+}
+
 fn save_callee_saves() -> vec[str] {
     ret vec("pushl %ebp",
             "pushl %edi",
@@ -18,6 +26,27 @@ fn save_callee_saves() -> vec[str] {
             "pushl %ebx");
 }
 
+fn save_callee_saves_with_cfi() -> vec[str] {
+    auto offset = 8;
+    auto t;
+    t  = vec("pushl %ebp");
+    t += vec(".cfi_def_cfa_offset " + istr(offset));
+    t += vec(".cfi_offset 5, -" + istr(offset));
+
+    t += vec("pushl %edi");
+    offset += 4;
+    t += vec(".cfi_def_cfa_offset " + istr(offset));
+
+    t += vec("pushl %esi");
+    offset += 4;
+    t += vec(".cfi_def_cfa_offset " + istr(offset));
+
+    t += vec("pushl %ebx");
+    offset += 4;
+    t += vec(".cfi_def_cfa_offset " + istr(offset));
+    ret t;
+}
+
 fn restore_callee_saves() -> vec[str] {
     ret vec("popl  %ebx",
             "popl  %esi",
@@ -211,9 +240,11 @@ fn native_glue(int n_args, bool pass_task) -> vec[str] {
     auto carg = bind copy_arg(pass_task, _);
 
     ret
-        save_callee_saves()
+        start()
+        + save_callee_saves_with_cfi()
 
         + vec("movl  %esp, %ebp     # ebp = rust_sp")
+        + vec(".cfi_def_cfa_register 5")
 
         + store_esp_to_rust_sp_second_arg()
         + load_esp_from_runtime_sp_second_arg()
@@ -229,7 +260,8 @@ fn native_glue(int n_args, bool pass_task) -> vec[str] {
 
         + load_esp_from_rust_sp_second_arg()
         + restore_callee_saves()
-        + vec("ret");
+        + vec("ret")
+        + end();
 
 }
 
diff --git a/src/rustllvm/RustWrapper.cpp b/src/rustllvm/RustWrapper.cpp
index e8431f81..43369b6d 100644
--- a/src/rustllvm/RustWrapper.cpp
+++ b/src/rustllvm/RustWrapper.cpp
@@ -54,7 +54,7 @@ extern "C" void LLVMRustWriteOutputFile(LLVMPassManagerRef PMR, LLVMModuleRef M,
                                         LLVMCodeGenFileType FileType) {
 
   // Set compilation options.
-  llvm::NoFramePointerElim = true;
+  llvm::UnwindTablesMandatory = true;
 
   InitializeAllTargets();
   InitializeAllAsmPrinters();