Skip to content

Commit

Permalink
stop clamping the DWARF version to 3 on Linux
Browse files Browse the repository at this point in the history 
Closes #13611
  • Loading branch information
@thestinger
thestinger committed Sep 18, 2014
1 parent 28407b6 commit 98fff20
Showing 1 changed file with 0 additions and 6 deletions.
6 changes: 0 additions & 6 deletions src/librustc/middle/trans/debuginfo.rs
View file
Expand Up @@ -738,12 +738,6 @@ pub fn finalize(cx: &CrateContext) {
cx.sess().targ_cfg.os == abi::OsiOS {
"Dwarf Version".with_c_str(
|s| llvm::LLVMRustAddModuleFlag(cx.llmod(), s, 2));
} else if cx.sess().targ_cfg.os == abi::OsLinux {
// FIXME(#13611) this is a kludge fix because the Linux bots have
// gdb 7.4 which doesn't understand dwarf4, we should
// do something more graceful here.
"Dwarf Version".with_c_str(
|s| llvm::LLVMRustAddModuleFlag(cx.llmod(), s, 3));
}

// Prevent bitcode readers from deleting the debug info.
Expand Down

5 comments on commit 98fff20

@bors
Copy link
Contributor

@bors bors commented on 98fff20 Sep 18, 2014

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

saw approval from pnkfelix
at https://github.com/thestinger/rust/commit/98fff20a7c95bdbb32652a95fd3211f743218b46

@bors
Copy link
Contributor

@bors bors commented on 98fff20 Sep 18, 2014

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

merging thestinger/rust/debuginfo = 98fff20 into auto

@bors
Copy link
Contributor

@bors bors commented on 98fff20 Sep 18, 2014

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

thestinger/rust/debuginfo = 98fff20 merged ok, testing candidate = d485e87

@bors
Copy link
Contributor

@bors bors commented on 98fff20 Sep 18, 2014

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

all tests pass:
success: http://buildbot.rust-lang.org/builders/auto-mac-32-opt/builds/1408
success: http://buildbot.rust-lang.org/builders/auto-mac-64-opt/builds/1407
success: http://buildbot.rust-lang.org/builders/auto-mac-64-nopt-c/builds/1406
success: http://buildbot.rust-lang.org/builders/auto-mac-64-nopt-t/builds/1407
success: http://buildbot.rust-lang.org/builders/auto-linux-32-opt/builds/1404
success: http://buildbot.rust-lang.org/builders/auto-linux-32-nopt-c/builds/1403
success: http://buildbot.rust-lang.org/builders/auto-linux-32-nopt-t/builds/1403
success: http://buildbot.rust-lang.org/builders/auto-linux-64-opt/builds/1407
success: http://buildbot.rust-lang.org/builders/auto-linux-64-nopt-c/builds/1401
success: http://buildbot.rust-lang.org/builders/auto-linux-64-nopt-t/builds/1401
success: http://buildbot.rust-lang.org/builders/auto-linux-64-x-android-t/builds/1404
success: http://buildbot.rust-lang.org/builders/auto-win32-32-opt/builds/239
success: http://buildbot.rust-lang.org/builders/auto-win32-32-nopt-t/builds/239
success: http://buildbot.rust-lang.org/builders/auto-win32-32-nopt-c/builds/239
success: http://buildbot.rust-lang.org/builders/auto-win64-64-opt/builds/239
success: http://buildbot.rust-lang.org/builders/auto-win64-64-nopt-t/builds/239
success: http://buildbot.rust-lang.org/builders/auto-win64-64-nopt-c/builds/239

@bors
Copy link
Contributor

@bors bors commented on 98fff20 Sep 18, 2014

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

fast-forwarding master to auto = d485e87

Please sign in to comment.