diff options
| author | bors <bors@rust-lang.org> | 2022-01-04 19:56:13 +0000 |
|---|---|---|
| committer | bors <bors@rust-lang.org> | 2022-01-04 19:56:13 +0000 |
| commit | 7d6f948173ccb18822bab13d548c65632db5f0aa (patch) | |
| tree | 0c6d6e241b150691b700e05281607dfd6f649d22 /compiler/rustc_codegen_ssa/src | |
| parent | 2b681ac06b1a6b7ea39525e59363ffee0d1a68e5 (diff) | |
| parent | 76c02711a5e30c71c3f4ff8bf0314578cf8b3256 (diff) | |
| download | rust-7d6f948173ccb18822bab13d548c65632db5f0aa.tar.gz rust-7d6f948173ccb18822bab13d548c65632db5f0aa.zip | |
Auto merge of #92556 - matthiaskrgr:rollup-s9vopuj, r=matthiaskrgr
Rollup of 7 pull requests Successful merges: - #91754 (Modifications to `std::io::Stdin` on Windows so that there is no longer a 4-byte buffer minimum in read().) - #91884 (Constify `Box<T, A>` methods) - #92107 (Actually set IMAGE_SCN_LNK_REMOVE for .rmeta) - #92456 (Make the documentation of builtin macro attributes accessible) - #92507 (Suggest single quotes when char expected, str provided) - #92525 (intra-doc: Make `Receiver::into_iter` into a clickable link) - #92532 (revert #92254 "Bump gsgdt to 0.1.3") Failed merges: r? `@ghost` `@rustbot` modify labels: rollup
Diffstat (limited to 'compiler/rustc_codegen_ssa/src')
| -rw-r--r-- | compiler/rustc_codegen_ssa/src/back/metadata.rs | 11 |
1 files changed, 5 insertions, 6 deletions
diff --git a/compiler/rustc_codegen_ssa/src/back/metadata.rs b/compiler/rustc_codegen_ssa/src/back/metadata.rs index 7c97143e807..79c24f0f172 100644 --- a/compiler/rustc_codegen_ssa/src/back/metadata.rs +++ b/compiler/rustc_codegen_ssa/src/back/metadata.rs @@ -6,8 +6,8 @@ use std::path::Path; use object::write::{self, StandardSegment, Symbol, SymbolSection}; use object::{ - elf, Architecture, BinaryFormat, Endianness, FileFlags, Object, ObjectSection, SectionFlags, - SectionKind, SymbolFlags, SymbolKind, SymbolScope, + elf, pe, Architecture, BinaryFormat, Endianness, FileFlags, Object, ObjectSection, + SectionFlags, SectionKind, SymbolFlags, SymbolKind, SymbolScope, }; use snap::write::FrameEncoder; @@ -216,13 +216,12 @@ pub fn create_rmeta_file(sess: &Session, metadata: &[u8]) -> Vec<u8> { ); match file.format() { BinaryFormat::Coff => { - const IMAGE_SCN_LNK_REMOVE: u32 = 0; file.section_mut(section).flags = - SectionFlags::Coff { characteristics: IMAGE_SCN_LNK_REMOVE }; + SectionFlags::Coff { characteristics: pe::IMAGE_SCN_LNK_REMOVE }; } BinaryFormat::Elf => { - const SHF_EXCLUDE: u64 = 0x80000000; - file.section_mut(section).flags = SectionFlags::Elf { sh_flags: SHF_EXCLUDE }; + file.section_mut(section).flags = + SectionFlags::Elf { sh_flags: elf::SHF_EXCLUDE as u64 }; } _ => {} }; |
