Merge commit '266e96785a' into sync_cg_clif-2022-10-23

2022-10-23 16:22:55 +02:00 · 2022-10-23 16:22:55 +02:00 · e54a13f18b
commit e54a13f18b
parent 9be2f35a4c 266e96785a
45 changed files with 1041 additions and 634 deletions
--- a/compiler/rustc_codegen_cranelift/src/archive.rs
+++ b/compiler/rustc_codegen_cranelift/src/archive.rs
@ -159,6 +159,8 @@ impl<'a> ArchiveBuilder<'a> for ArArchiveBuilder<'a> {
                        let err = err.to_string();
                        if err == "Unknown file magic" {
                            // Not an object file; skip it.
+                        } else if object::read::archive::ArchiveFile::parse(&*data).is_ok() {
+                            // Nested archive file; skip it.
                        } else {
                            sess.fatal(&format!(
                                "error parsing `{}` during archive creation: {}",