bjoernager/rust
bjoernager/rust
1
Fork 0
Code Activity

Rollup merge of #104067 - jeremyd2019:patch-1, r=davidtwco

Browse source 
fix debuginfo for windows_gnullvm_base.rs

These lines (including the FIXME comment) were added to windows_gnu_base.rs in cf2c492ef8 but windows_gnullvm_base.rs was not updated.  This resulted in an error `LLVM ERROR: dwo only supported with ELF and Wasm` attempting to build on aarch64-pc-windows-gnullvm.

See also https://github.com/msys2/MINGW-packages/pull/13921#issuecomment-1304391707

/cc ```@mati865``` ```@davidtwco```

r? ```@davidtwco```
This commit is contained in:
Dylan DPC 2022-11-08 11:23:53 +05:30 • committed by GitHub
commit 2b9e099a83
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 6 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

8
compiler/rustc_target/src/spec/windows_gnullvm_base.rs
View file

@ -1,4 +1,5 @@
use crate::spec::{cvs, Cc, LinkerFlavor, Lld, TargetOptions}; use crate::spec::{cvs, Cc, DebuginfoKind, LinkerFlavor, Lld, SplitDebuginfo, TargetOptions};
use std::borrow::Cow;
pub fn opts() -> TargetOptions { pub fn opts() -> TargetOptions {
// We cannot use `-nodefaultlibs` because compiler-rt has to be passed // We cannot use `-nodefaultlibs` because compiler-rt has to be passed
@ -36,7 +37,10 @@ pub fn opts() -> TargetOptions {
eh_frame_header: false, eh_frame_header: false,
no_default_libraries: false, no_default_libraries: false,
has_thread_local: true, has_thread_local: true,
// FIXME(davidtwco): Support Split DWARF on Windows GNU - may require LLVM changes to
// output DWO, despite using DWARF, doesn't use ELF..
debuginfo_kind: DebuginfoKind::Pdb,
supported_split_debuginfo: Cow::Borrowed(&[SplitDebuginfo::Off]),
..Default::default() ..Default::default()
} }
} }