use std::collections::BTreeMap;
use std::fs::File;
+use std::io::{self, Read, Seek};
use std::path::{Path, PathBuf};
-use rustc_codegen_ssa::back::archive::{find_library, ArchiveBuilder};
-use rustc_codegen_ssa::METADATA_FILENAME;
+use rustc_codegen_ssa::back::archive::ArchiveBuilder;
use rustc_session::Session;
-use object::{Object, ObjectSymbol, SymbolKind};
+use object::read::archive::ArchiveFile;
+use object::{Object, ObjectSymbol, ReadCache};
#[derive(Debug)]
enum ArchiveEntry {
- FromArchive { archive_index: usize, entry_index: usize },
+ FromArchive { archive_index: usize, file_range: (u64, u64) },
File(PathBuf),
}
pub(crate) struct ArArchiveBuilder<'a> {
sess: &'a Session,
dst: PathBuf,
- lib_search_paths: Vec<PathBuf>,
use_gnu_style_archive: bool,
no_builtin_ranlib: bool,
- src_archives: Vec<(PathBuf, ar::Archive<File>)>,
+ src_archives: Vec<File>,
// Don't use `HashMap` here, as the order is important. `rust.metadata.bin` must always be at
// the end of an archive for linkers to not get confused.
- entries: Vec<(String, ArchiveEntry)>,
+ entries: Vec<(Vec<u8>, ArchiveEntry)>,
}
impl<'a> ArchiveBuilder<'a> for ArArchiveBuilder<'a> {
- fn new(sess: &'a Session, output: &Path, input: Option<&Path>) -> Self {
- use rustc_codegen_ssa::back::link::archive_search_paths;
-
- let (src_archives, entries) = if let Some(input) = input {
- let mut archive = ar::Archive::new(File::open(input).unwrap());
- let mut entries = Vec::new();
-
- let mut i = 0;
- while let Some(entry) = archive.next_entry() {
- let entry = entry.unwrap();
- entries.push((
- String::from_utf8(entry.header().identifier().to_vec()).unwrap(),
- ArchiveEntry::FromArchive { archive_index: 0, entry_index: i },
- ));
- i += 1;
- }
-
- (vec![(input.to_owned(), archive)], entries)
- } else {
- (vec![], Vec::new())
- };
-
+ fn new(sess: &'a Session, output: &Path) -> Self {
ArArchiveBuilder {
sess,
dst: output.to_path_buf(),
- lib_search_paths: archive_search_paths(sess),
use_gnu_style_archive: sess.target.archive_format == "gnu",
// FIXME fix builtin ranlib on macOS
no_builtin_ranlib: sess.target.is_like_osx,
- src_archives,
- entries,
+ src_archives: vec![],
+ entries: vec![],
}
}
- fn src_files(&mut self) -> Vec<String> {
- self.entries.iter().map(|(name, _)| name.clone()).collect()
- }
-
- fn remove_file(&mut self, name: &str) {
- let index = self
- .entries
- .iter()
- .position(|(entry_name, _)| entry_name == name)
- .expect("Tried to remove file not existing in src archive");
- self.entries.remove(index);
- }
-
fn add_file(&mut self, file: &Path) {
self.entries.push((
- file.file_name().unwrap().to_str().unwrap().to_string(),
+ file.file_name().unwrap().to_str().unwrap().to_string().into_bytes(),
ArchiveEntry::File(file.to_owned()),
));
}
- fn add_native_library(&mut self, name: rustc_span::symbol::Symbol, verbatim: bool) {
- let location = find_library(name, verbatim, &self.lib_search_paths, self.sess);
- self.add_archive(location.clone(), |_| false).unwrap_or_else(|e| {
- panic!("failed to add native library {}: {}", location.to_string_lossy(), e);
- });
- }
-
- fn add_rlib(
- &mut self,
- rlib: &Path,
- name: &str,
- lto: bool,
- skip_objects: bool,
- ) -> std::io::Result<()> {
- let obj_start = name.to_owned();
-
- self.add_archive(rlib.to_owned(), move |fname: &str| {
- // Ignore metadata files, no matter the name.
- if fname == METADATA_FILENAME {
- return true;
- }
-
- // Don't include Rust objects if LTO is enabled
- if lto && fname.starts_with(&obj_start) && fname.ends_with(".o") {
- return true;
- }
+ fn add_archive<F>(&mut self, archive_path: &Path, mut skip: F) -> std::io::Result<()>
+ where
+ F: FnMut(&str) -> bool + 'static,
+ {
+ let read_cache = ReadCache::new(std::fs::File::open(&archive_path)?);
+ let archive = ArchiveFile::parse(&read_cache).unwrap();
+ let archive_index = self.src_archives.len();
- // Otherwise if this is *not* a rust object and we're skipping
- // objects then skip this file
- if skip_objects && (!fname.starts_with(&obj_start) || !fname.ends_with(".o")) {
- return true;
+ for entry in archive.members() {
+ let entry = entry.map_err(|err| io::Error::new(io::ErrorKind::InvalidData, err))?;
+ let file_name = String::from_utf8(entry.name().to_vec())
+ .map_err(|err| io::Error::new(io::ErrorKind::InvalidData, err))?;
+ if !skip(&file_name) {
+ self.entries.push((
+ file_name.into_bytes(),
+ ArchiveEntry::FromArchive { archive_index, file_range: entry.file_range() },
+ ));
}
+ }
- // ok, don't skip this
- false
- })
+ self.src_archives.push(read_cache.into_inner());
+ Ok(())
}
- fn update_symbols(&mut self) {}
-
- fn build(mut self) {
+ fn build(mut self) -> bool {
enum BuilderKind {
Bsd(ar::Builder<File>),
Gnu(ar::GnuBuilder<File>),
let mut entries = Vec::new();
- for (entry_name, entry) in self.entries {
+ for (mut entry_name, entry) in self.entries {
// FIXME only read the symbol table of the object files to avoid having to keep all
// object files in memory at once, or read them twice.
let data = match entry {
- ArchiveEntry::FromArchive { archive_index, entry_index } => {
+ ArchiveEntry::FromArchive { archive_index, file_range } => {
// FIXME read symbols from symtab
- use std::io::Read;
- let (ref _src_archive_path, ref mut src_archive) =
- self.src_archives[archive_index];
- let mut entry = src_archive.jump_to_entry(entry_index).unwrap();
- let mut data = Vec::new();
- entry.read_to_end(&mut data).unwrap();
+ let src_read_cache = &mut self.src_archives[archive_index];
+
+ src_read_cache.seek(io::SeekFrom::Start(file_range.0)).unwrap();
+ let mut data = std::vec::from_elem(0, usize::try_from(file_range.1).unwrap());
+ src_read_cache.read_exact(&mut data).unwrap();
+
data
}
ArchiveEntry::File(file) => std::fs::read(file).unwrap_or_else(|err| {
};
if !self.no_builtin_ranlib {
+ if symbol_table.contains_key(&entry_name) {
+ // The ar crate can't handle creating a symbol table in case of multiple archive
+ // members with the same name. Work around this by prepending a number until we
+ // get a unique name.
+ for i in 1.. {
+ let new_name = format!("{}_", i)
+ .into_bytes()
+ .into_iter()
+ .chain(entry_name.iter().copied())
+ .collect::<Vec<_>>();
+ if !symbol_table.contains_key(&new_name) {
+ entry_name = new_name;
+ break;
+ }
+ }
+ }
+
match object::File::parse(&*data) {
Ok(object) => {
symbol_table.insert(
- entry_name.as_bytes().to_vec(),
+ entry_name.to_vec(),
object
.symbols()
.filter_map(|symbol| {
- if symbol.is_undefined()
- || symbol.is_local()
- || symbol.kind() != SymbolKind::Data
- && symbol.kind() != SymbolKind::Text
- && symbol.kind() != SymbolKind::Tls
- {
+ if symbol.is_undefined() || symbol.is_local() {
None
} else {
symbol.name().map(|name| name.as_bytes().to_vec()).ok()
} else {
sess.fatal(&format!(
"error parsing `{}` during archive creation: {}",
- entry_name, err
+ String::from_utf8_lossy(&entry_name),
+ err
));
}
}
err
));
}),
- entries.iter().map(|(name, _)| name.as_bytes().to_vec()).collect(),
+ entries.iter().map(|(name, _)| name.clone()).collect(),
ar::GnuSymbolTableFormat::Size32,
symbol_table,
)
)
};
+ let any_members = !entries.is_empty();
+
// Add all files
for (entry_name, data) in entries.into_iter() {
- let header = ar::Header::new(entry_name.into_bytes(), data.len() as u64);
+ let header = ar::Header::new(entry_name, data.len() as u64);
match builder {
BuilderKind::Bsd(ref mut builder) => builder.append(&header, &mut &*data).unwrap(),
BuilderKind::Gnu(ref mut builder) => builder.append(&header, &mut &*data).unwrap(),
self.sess.fatal(&format!("Ranlib exited with code {:?}", status.code()));
}
}
+
+ any_members
}
fn inject_dll_import_lib(
&mut self,
_lib_name: &str,
- _dll_imports: &[rustc_middle::middle::cstore::DllImport],
+ _dll_imports: &[rustc_session::cstore::DllImport],
_tmpdir: &rustc_data_structures::temp_dir::MaybeTempDir,
) {
bug!("injecting dll imports is not supported");
}
}
-
-impl<'a> ArArchiveBuilder<'a> {
- fn add_archive<F>(&mut self, archive_path: PathBuf, mut skip: F) -> std::io::Result<()>
- where
- F: FnMut(&str) -> bool + 'static,
- {
- let mut archive = ar::Archive::new(std::fs::File::open(&archive_path)?);
- let archive_index = self.src_archives.len();
-
- let mut i = 0;
- while let Some(entry) = archive.next_entry() {
- let entry = entry?;
- let file_name = String::from_utf8(entry.header().identifier().to_vec())
- .map_err(|err| std::io::Error::new(std::io::ErrorKind::InvalidData, err))?;
- if !skip(&file_name) {
- self.entries
- .push((file_name, ArchiveEntry::FromArchive { archive_index, entry_index: i }));
- }
- i += 1;
- }
-
- self.src_archives.push((archive_path, archive));
- Ok(())
- }
-}
projects / rust.git / blobdiff