From e8e0cdd73f4c919de02387734e8ee25b2e7b780c Mon Sep 17 00:00:00 2001 From: Alex Crichton Date: Fri, 31 Jan 2014 10:18:13 -0800 Subject: [PATCH] Disable fp elim on mac64 I believe that this is leading to lots of failures on the bots. cc #11954 --- src/librustc/back/link.rs | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/src/librustc/back/link.rs b/src/librustc/back/link.rs index 3a6b9f399aa..a81302035ee 100644 --- a/src/librustc/back/link.rs +++ b/src/librustc/back/link.rs @@ -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| {