From f64ecf12c7ec8d4e57507e33465e553d24467066 Mon Sep 17 00:00:00 2001
From: Chris Denton <chris@chrisdenton.dev>
Date: Sun, 18 Aug 2024 22:45:46 +0000
Subject: [PATCH] WIP

---
 Cargo.lock                                     |  5 ++---
 compiler/rustc_codegen_ssa/Cargo.toml          | 14 ++++++++++++--
 compiler/rustc_codegen_ssa/src/back/archive.rs |  6 +++++-
 src/tools/tidy/src/extdeps.rs                  |  1 +
 4 files changed, 20 insertions(+), 6 deletions(-)

diff --git a/Cargo.lock b/Cargo.lock
index 3ad21b0abf920..cdbe7856ba79a 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -205,9 +205,8 @@ dependencies = [
 
 [[package]]
 name = "ar_archive_writer"
-version = "0.4.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "de11a9d32db3327f981143bdf699ade4d637c6887b13b97e6e91a9154666963c"
+version = "0.3.3"
+source = "git+https://github.com/ChrisDenton/ar_archive_writer.git?branch=rename2#a5b424a6ef9d6416b299ac27c2dba224e2470253"
 dependencies = [
  "object 0.36.2",
 ]
diff --git a/compiler/rustc_codegen_ssa/Cargo.toml b/compiler/rustc_codegen_ssa/Cargo.toml
index 0af34a1b9fa62..f711c4533b645 100644
--- a/compiler/rustc_codegen_ssa/Cargo.toml
+++ b/compiler/rustc_codegen_ssa/Cargo.toml
@@ -5,7 +5,7 @@ edition = "2021"
 
 [dependencies]
 # tidy-alphabetical-start
-ar_archive_writer = "0.4.0"
+ar_archive_writer = { git = 'https://github.com/ChrisDenton/ar_archive_writer.git', branch = "rename2" }
 arrayvec = { version = "0.7", default-features = false }
 bitflags = "2.4.1"
 cc = "1.0.90"
@@ -52,7 +52,17 @@ libc = "0.2.50"
 [dependencies.object]
 version = "0.36.2"
 default-features = false
-features = ["read_core", "elf", "macho", "pe", "xcoff", "unaligned", "archive", "write", "wasm"]
+features = [
+    "read_core",
+    "elf",
+    "macho",
+    "pe",
+    "xcoff",
+    "unaligned",
+    "archive",
+    "write",
+    "wasm",
+]
 
 [target.'cfg(windows)'.dependencies.windows]
 version = "0.52.0"
diff --git a/compiler/rustc_codegen_ssa/src/back/archive.rs b/compiler/rustc_codegen_ssa/src/back/archive.rs
index 38a440a707a23..e838c82d569f9 100644
--- a/compiler/rustc_codegen_ssa/src/back/archive.rs
+++ b/compiler/rustc_codegen_ssa/src/back/archive.rs
@@ -108,7 +108,11 @@ pub trait ArchiveBuilderBuilder {
                 &exports,
                 machine,
                 !sess.target.is_like_msvc,
-                /*comdat=*/ false,
+                // Tell the import library writer to make `.idata$3` a COMDAT section.
+                // This prevents duplicate symbol errors when using /WHOLEARCHIVE
+                // to link a staticlib with the MSVC linker.
+                // See #129020
+                true,
             ) {
                 sess.dcx()
                     .emit_fatal(ErrorCreatingImportLibrary { lib_name, error: error.to_string() });
diff --git a/src/tools/tidy/src/extdeps.rs b/src/tools/tidy/src/extdeps.rs
index 55f937aeacf50..44a27cc95316f 100644
--- a/src/tools/tidy/src/extdeps.rs
+++ b/src/tools/tidy/src/extdeps.rs
@@ -8,6 +8,7 @@ const ALLOWED_SOURCES: &[&str] = &[
     r#""registry+https://github.com/rust-lang/crates.io-index""#,
     // This is `rust_team_data` used by `site` in src/tools/rustc-perf,
     r#""git+https://github.com/rust-lang/team#a5260e76d3aa894c64c56e6ddc8545b9a98043ec""#,
+    r#""git+https://github.com/ChrisDenton/ar_archive_writer.git?branch=rename2#a5b424a6ef9d6416b299ac27c2dba224e2470253""#,
 ];
 
 /// Checks for external package sources. `root` is the path to the directory that contains the