mikros/rust
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

auto merge of #11955 : alexcrichton/rust/fix-unwinding-on-mac-64, r=cmr

Browse Source 
I believe that this is leading to lots of failures on the bots.

cc #11954
This commit is contained in:
bors 2014-01-31 11:21:33 -08:00
commit f47879637f
1 changed files with 5 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/librustc/back/link.rs
View File

@ -96,6 +96,7 @@ pub mod write {
use lib::llvm::llvm;
use lib::llvm::{ModuleRef, TargetMachineRef, PassManagerRef};
use lib;
use syntax::abi;
use util::common::time;
use std::c_str::ToCStr;
@ -129,7 +130,10 @@ pub mod write {
let use_softfp = sess.opts.debugging_opts & session::USE_SOFTFP != 0;
// FIXME: #11906: Omitting frame pointers breaks retrieving the value of a parameter.
let no_fp_elim = sess.opts.debuginfo;
// FIXME: #11954: mac64 unwinding may not work with fp elim
let no_fp_elim = sess.opts.debuginfo ||
(sess.targ_cfg.os == abi::OsMacos &&
sess.targ_cfg.arch == abi::X86_64);
let tm = sess.targ_cfg.target_strs.target_triple.with_c_str(|T| {
sess.opts.target_cpu.with_c_str(|CPU| {