diff options
| author | bors <bors@rust-lang.org> | 2022-02-11 15:16:09 +0000 |
|---|---|---|
| committer | bors <bors@rust-lang.org> | 2022-02-11 15:16:09 +0000 |
| commit | 78450d2d602b06d9b94349aaf8cece1a4acaf3a8 (patch) | |
| tree | 5bc15e671d115341faaa337fd223353696755ab1 /compiler/rustc_codegen_llvm/src | |
| parent | e273fca380c5d28bc32b25ac1a885c61d4c5e75e (diff) | |
| parent | c543f7dbd4cc4afb57cb00b2937b50a3371fa15d (diff) | |
| download | rust-78450d2d602b06d9b94349aaf8cece1a4acaf3a8.tar.gz rust-78450d2d602b06d9b94349aaf8cece1a4acaf3a8.zip | |
Auto merge of #93891 - matthiaskrgr:rollup-xadut8w, r=matthiaskrgr
Rollup of 8 pull requests Successful merges: - #92242 (Erase regions before calculating layout for packed field capture) - #93443 (Add comment on stable_hash_impl for OwnerNodes) - #93742 (Drop rustc-docs from complete profile) - #93852 (rustdoc: remove support for multi-query search) - #93853 (Make all `hir::Map` methods consistently by-value) - #93861 (Fix ICE if no trait assoc const eq) - #93862 (Split x86_64-apple builder into two) - #93864 (Remove ArchiveBuilder::update_symbols) Failed merges: r? `@ghost` `@rustbot` modify labels: rollup
Diffstat (limited to 'compiler/rustc_codegen_llvm/src')
| -rw-r--r-- | compiler/rustc_codegen_llvm/src/back/archive.rs | 11 |
1 files changed, 1 insertions, 10 deletions
diff --git a/compiler/rustc_codegen_llvm/src/back/archive.rs b/compiler/rustc_codegen_llvm/src/back/archive.rs index 8a1dea4d99b..21bd1dae7ac 100644 --- a/compiler/rustc_codegen_llvm/src/back/archive.rs +++ b/compiler/rustc_codegen_llvm/src/back/archive.rs @@ -27,7 +27,6 @@ pub struct LlvmArchiveBuilder<'a> { config: ArchiveConfig<'a>, removals: Vec<String>, additions: Vec<Addition>, - should_update_symbols: bool, src_archive: Option<Option<ArchiveRO>>, } @@ -75,7 +74,6 @@ impl<'a> ArchiveBuilder<'a> for LlvmArchiveBuilder<'a> { config, removals: Vec::new(), additions: Vec::new(), - should_update_symbols: false, src_archive: None, } } @@ -129,12 +127,6 @@ impl<'a> ArchiveBuilder<'a> for LlvmArchiveBuilder<'a> { .push(Addition::File { path: file.to_path_buf(), name_in_archive: name.to_owned() }); } - /// Indicate that the next call to `build` should update all symbols in - /// the archive (equivalent to running 'ar s' over it). - fn update_symbols(&mut self) { - self.should_update_symbols = true; - } - /// Combine the provided files, rlibs, and native libraries into a single /// `Archive`. fn build(mut self) { @@ -313,7 +305,6 @@ impl<'a> LlvmArchiveBuilder<'a> { let mut members = Vec::new(); let dst = CString::new(self.config.dst.to_str().unwrap())?; - let should_update_symbols = self.should_update_symbols; unsafe { if let Some(archive) = self.src_archive() { @@ -385,7 +376,7 @@ impl<'a> LlvmArchiveBuilder<'a> { dst.as_ptr(), members.len() as libc::size_t, members.as_ptr() as *const &_, - should_update_symbols, + true, kind, ); let ret = if r.into_result().is_err() { |
