diff --git a/compiler/rustc_codegen_ssa/src/back/link.rs b/compiler/rustc_codegen_ssa/src/back/link.rs
index 9a0c379b4e44d..bac487b0f71ba 100644
--- a/compiler/rustc_codegen_ssa/src/back/link.rs
+++ b/compiler/rustc_codegen_ssa/src/back/link.rs
@@ -2031,15 +2031,6 @@ fn linker_with_args<'a>(
         tmpdir,
     );
 
-    // Dynamic native libraries from upstream crates.
-    //
-    // FIXME: Merge this to `add_upstream_rust_crates` so that all native libraries are linked
-    // together with their respective upstream crates, and in their originally specified order.
-    // This may be slightly breaking due to our use of `--as-needed` and needs a crater run.
-    if sess.opts.unstable_opts.link_native_libraries {
-        add_upstream_native_libraries(cmd, sess, codegen_results);
-    }
-
     // Link with the import library generated for any raw-dylib functions.
     for (raw_dylib_name, raw_dylib_imports) in
         collate_raw_dylibs(sess, &codegen_results.crate_info.used_libraries)?
@@ -2375,7 +2366,8 @@ fn add_upstream_rust_crates<'a>(
         // appear statically in an existing dylib, meaning we'll pick up all the
         // symbols from the dylib.
         let src = &codegen_results.crate_info.used_crate_source[&cnum];
-        match data[cnum.as_usize() - 1] {
+        let linkage = data[cnum.as_usize() - 1];
+        match linkage {
             _ if codegen_results.crate_info.profiler_runtime == Some(cnum) => {
                 add_static_crate(
                     cmd,
@@ -2412,89 +2404,105 @@ fn add_upstream_rust_crates<'a>(
                     cnum,
                     &bundled_libs,
                 );
+            }
+            Linkage::Dynamic => add_dynamic_crate(cmd, sess, &src.dylib.as_ref().unwrap().0),
+        }
 
-                // Link static native libs with "-bundle" modifier only if the crate they originate from
-                // is being linked statically to the current crate.  If it's linked dynamically
-                // or is an rlib already included via some other dylib crate, the symbols from
-                // native libs will have already been included in that dylib.
-                //
-                // If `-Zlink-native-libraries=false` is set, then the assumption is that an
-                // external build system already has the native dependencies defined, and it
-                // will provide them to the linker itself.
-                if sess.opts.unstable_opts.link_native_libraries {
-                    if sess.opts.unstable_opts.packed_bundled_libs {
-                        // If rlib contains native libs as archives, unpack them to tmpdir.
-                        let rlib = &src.rlib.as_ref().unwrap().0;
-                        archive_builder_builder
-                            .extract_bundled_libs(rlib, tmpdir, &bundled_libs)
-                            .unwrap_or_else(|e| sess.fatal(e));
-                    }
+        if sess.opts.unstable_opts.link_native_libraries
+            && codegen_results.crate_info.compiler_builtins != Some(cnum)
+        {
+            if (linkage == Linkage::Static
+                || codegen_results.crate_info.compiler_builtins == Some(cnum)
+                || codegen_results.crate_info.profiler_runtime == Some(cnum))
+                && sess.opts.unstable_opts.packed_bundled_libs
+            {
+                let bundled_libs = if sess.opts.unstable_opts.packed_bundled_libs {
+                    codegen_results.crate_info.native_libraries[&cnum]
+                        .iter()
+                        .filter_map(|lib| lib.filename)
+                        .collect::<FxHashSet<_>>()
+                } else {
+                    Default::default()
+                };
+                // If rlib contains native libs as archives, unpack them to tmpdir.
+                let rlib = &src.rlib.as_ref().unwrap().0;
+                archive_builder_builder
+                    .extract_bundled_libs(rlib, tmpdir, &bundled_libs)
+                    .unwrap_or_else(|e| sess.fatal(e));
+            }
 
-                    let mut last = (None, NativeLibKind::Unspecified, None);
-                    for lib in &codegen_results.crate_info.native_libraries[&cnum] {
-                        let Some(name) = lib.name else {
-                            continue;
-                        };
-                        let name = name.as_str();
-                        if !relevant_lib(sess, lib) {
-                            continue;
-                        }
+            let mut last = (None, NativeLibKind::Unspecified, None);
+            for lib in &codegen_results.crate_info.native_libraries[&cnum] {
+                let Some(name) = lib.name else {
+                    continue;
+                };
+                let name = name.as_str();
+                if !relevant_lib(sess, lib) {
+                    continue;
+                }
 
-                        // Skip if this library is the same as the last.
-                        last = if (lib.name, lib.kind, lib.verbatim) == last {
-                            continue;
-                        } else {
-                            (lib.name, lib.kind, lib.verbatim)
-                        };
-
-                        match lib.kind {
-                            NativeLibKind::Static {
-                                bundle: Some(false),
-                                whole_archive: Some(true),
-                            } => {
-                                cmd.link_whole_staticlib(
-                                    name,
-                                    lib.verbatim.unwrap_or(false),
-                                    search_path.get_or_init(|| archive_search_paths(sess)),
-                                );
-                            }
-                            NativeLibKind::Static {
-                                bundle: Some(false),
-                                whole_archive: Some(false) | None,
-                            } => {
-                                // HACK/FIXME: Fixup a circular dependency between libgcc and libc
-                                // with glibc. This logic should be moved to the libc crate.
-                                if sess.target.os == "linux"
-                                    && sess.target.env == "gnu"
-                                    && name == "c"
-                                {
-                                    cmd.link_staticlib("gcc", false);
-                                }
-                                cmd.link_staticlib(name, lib.verbatim.unwrap_or(false));
-                            }
-                            NativeLibKind::LinkArg => {
-                                cmd.arg(name);
+                // Skip if this library is the same as the last.
+                last = if (lib.name, lib.kind, lib.verbatim) == last {
+                    continue;
+                } else {
+                    (lib.name, lib.kind, lib.verbatim)
+                };
+
+                let verbatim = lib.verbatim.unwrap_or(false);
+                match lib.kind {
+                    NativeLibKind::Static { bundle: Some(false), whole_archive: Some(true) } => {
+                        if linkage == Linkage::Static {
+                            cmd.link_whole_staticlib(
+                                name,
+                                verbatim,
+                                search_path.get_or_init(|| archive_search_paths(sess)),
+                            );
+                        }
+                    }
+                    NativeLibKind::Static {
+                        bundle: Some(false),
+                        whole_archive: Some(false) | None,
+                    } => {
+                        if linkage == Linkage::Static {
+                            // HACK/FIXME: Fixup a circular dependency between libgcc and libc
+                            // with glibc. This logic should be moved to the libc crate.
+                            if sess.target.os == "linux" && sess.target.env == "gnu" && name == "c"
+                            {
+                                cmd.link_staticlib("gcc", false);
                             }
-                            NativeLibKind::Dylib { .. }
-                            | NativeLibKind::Framework { .. }
-                            | NativeLibKind::Unspecified
-                            | NativeLibKind::RawDylib => {}
-                            NativeLibKind::Static { bundle: Some(true) | None, whole_archive } => {
-                                if sess.opts.unstable_opts.packed_bundled_libs {
-                                    // If rlib contains native libs as archives, they are unpacked to tmpdir.
-                                    let path = tmpdir.join(lib.filename.unwrap().as_str());
-                                    if whole_archive == Some(true) {
-                                        cmd.link_whole_rlib(&path);
-                                    } else {
-                                        cmd.link_rlib(&path);
-                                    }
-                                }
+                            cmd.link_staticlib(name, verbatim);
+                        }
+                    }
+                    NativeLibKind::Static { bundle: Some(true) | None, whole_archive } => {
+                        if (linkage == Linkage::Static
+                            || codegen_results.crate_info.compiler_builtins == Some(cnum)
+                            || codegen_results.crate_info.profiler_runtime == Some(cnum))
+                            && sess.opts.unstable_opts.packed_bundled_libs
+                        {
+                            // If rlib contains native libs as archives, they are unpacked to tmpdir.
+                            let path = tmpdir.join(lib.filename.unwrap().as_str());
+                            if whole_archive == Some(true) {
+                                cmd.link_whole_rlib(&path);
+                            } else {
+                                cmd.link_rlib(&path);
                             }
                         }
                     }
+                    NativeLibKind::Dylib { as_needed } => {
+                        cmd.link_dylib(name, verbatim, as_needed.unwrap_or(true))
+                    }
+                    NativeLibKind::RawDylib => {}
+                    NativeLibKind::Framework { as_needed } => {
+                        cmd.link_framework(name, as_needed.unwrap_or(true))
+                    }
+                    NativeLibKind::LinkArg => {
+                        if linkage == Linkage::Static {
+                            cmd.arg(name);
+                        }
+                    }
+                    NativeLibKind::Unspecified => cmd.link_dylib(name, verbatim, true),
                 }
             }
-            Linkage::Dynamic => add_dynamic_crate(cmd, sess, &src.dylib.as_ref().unwrap().0),
         }
     }
 
@@ -2513,6 +2521,101 @@ fn add_upstream_rust_crates<'a>(
             cnum,
             &Default::default(),
         );
+
+        let src = &codegen_results.crate_info.used_crate_source[&cnum];
+        let linkage = data[cnum.as_usize() - 1];
+        if sess.opts.unstable_opts.link_native_libraries {
+            if (linkage == Linkage::Static
+                || codegen_results.crate_info.compiler_builtins == Some(cnum))
+                && sess.opts.unstable_opts.packed_bundled_libs
+            {
+                let bundled_libs = if sess.opts.unstable_opts.packed_bundled_libs {
+                    codegen_results.crate_info.native_libraries[&cnum]
+                        .iter()
+                        .filter_map(|lib| lib.filename)
+                        .collect::<FxHashSet<_>>()
+                } else {
+                    Default::default()
+                };
+                // If rlib contains native libs as archives, unpack them to tmpdir.
+                let rlib = &src.rlib.as_ref().unwrap().0;
+                archive_builder_builder
+                    .extract_bundled_libs(rlib, tmpdir, &bundled_libs)
+                    .unwrap_or_else(|e| sess.fatal(e));
+            }
+
+            let mut last = (None, NativeLibKind::Unspecified, None);
+            for lib in &codegen_results.crate_info.native_libraries[&cnum] {
+                let Some(name) = lib.name else {
+                    continue;
+                };
+                let name = name.as_str();
+                if !relevant_lib(sess, lib) {
+                    continue;
+                }
+
+                // Skip if this library is the same as the last.
+                last = if (lib.name, lib.kind, lib.verbatim) == last {
+                    continue;
+                } else {
+                    (lib.name, lib.kind, lib.verbatim)
+                };
+
+                let verbatim = lib.verbatim.unwrap_or(false);
+                match lib.kind {
+                    NativeLibKind::Static { bundle: Some(false), whole_archive: Some(true) } => {
+                        if linkage == Linkage::Static {
+                            cmd.link_whole_staticlib(
+                                name,
+                                verbatim,
+                                search_path.get_or_init(|| archive_search_paths(sess)),
+                            );
+                        }
+                    }
+                    NativeLibKind::Static {
+                        bundle: Some(false),
+                        whole_archive: Some(false) | None,
+                    } => {
+                        if linkage == Linkage::Static {
+                            // HACK/FIXME: Fixup a circular dependency between libgcc and libc
+                            // with glibc. This logic should be moved to the libc crate.
+                            if sess.target.os == "linux" && sess.target.env == "gnu" && name == "c"
+                            {
+                                cmd.link_staticlib("gcc", false);
+                            }
+                            cmd.link_staticlib(name, verbatim);
+                        }
+                    }
+                    NativeLibKind::Static { bundle: Some(true) | None, whole_archive } => {
+                        if (linkage == Linkage::Static
+                            || codegen_results.crate_info.compiler_builtins == Some(cnum))
+                            && sess.opts.unstable_opts.packed_bundled_libs
+                        {
+                            // If rlib contains native libs as archives, they are unpacked to tmpdir.
+                            let path = tmpdir.join(lib.filename.unwrap().as_str());
+                            if whole_archive == Some(true) {
+                                cmd.link_whole_rlib(&path);
+                            } else {
+                                cmd.link_rlib(&path);
+                            }
+                        }
+                    }
+                    NativeLibKind::Dylib { as_needed } => {
+                        cmd.link_dylib(name, verbatim, as_needed.unwrap_or(true))
+                    }
+                    NativeLibKind::RawDylib => {}
+                    NativeLibKind::Framework { as_needed } => {
+                        cmd.link_framework(name, as_needed.unwrap_or(true))
+                    }
+                    NativeLibKind::LinkArg => {
+                        if linkage == Linkage::Static {
+                            cmd.arg(name);
+                        }
+                    }
+                    NativeLibKind::Unspecified => cmd.link_dylib(name, verbatim, true),
+                }
+            }
+        }
     }
 
     // Converts a library file-stem into a cc -l argument
@@ -2648,63 +2751,6 @@ fn add_upstream_rust_crates<'a>(
     }
 }
 
-/// Link in all of our upstream crates' native dependencies. Remember that all of these upstream
-/// native dependencies are all non-static dependencies. We've got two cases then:
-///
-/// 1. The upstream crate is an rlib. In this case we *must* link in the native dependency because
-/// the rlib is just an archive.
-///
-/// 2. The upstream crate is a dylib. In order to use the dylib, we have to have the dependency
-/// present on the system somewhere. Thus, we don't gain a whole lot from not linking in the
-/// dynamic dependency to this crate as well.
-///
-/// The use case for this is a little subtle. In theory the native dependencies of a crate are
-/// purely an implementation detail of the crate itself, but the problem arises with generic and
-/// inlined functions. If a generic function calls a native function, then the generic function
-/// must be instantiated in the target crate, meaning that the native symbol must also be resolved
-/// in the target crate.
-fn add_upstream_native_libraries(
-    cmd: &mut dyn Linker,
-    sess: &Session,
-    codegen_results: &CodegenResults,
-) {
-    let mut last = (None, NativeLibKind::Unspecified, None);
-    for &cnum in &codegen_results.crate_info.used_crates {
-        for lib in codegen_results.crate_info.native_libraries[&cnum].iter() {
-            let Some(name) = lib.name else {
-                continue;
-            };
-            let name = name.as_str();
-            if !relevant_lib(sess, &lib) {
-                continue;
-            }
-
-            // Skip if this library is the same as the last.
-            last = if (lib.name, lib.kind, lib.verbatim) == last {
-                continue;
-            } else {
-                (lib.name, lib.kind, lib.verbatim)
-            };
-
-            let verbatim = lib.verbatim.unwrap_or(false);
-            match lib.kind {
-                NativeLibKind::Dylib { as_needed } => {
-                    cmd.link_dylib(name, verbatim, as_needed.unwrap_or(true))
-                }
-                NativeLibKind::Unspecified => cmd.link_dylib(name, verbatim, true),
-                NativeLibKind::Framework { as_needed } => {
-                    cmd.link_framework(name, as_needed.unwrap_or(true))
-                }
-                // ignore static native libraries here as we've
-                // already included them in add_local_native_libraries and
-                // add_upstream_rust_crates
-                NativeLibKind::Static { .. } => {}
-                NativeLibKind::RawDylib | NativeLibKind::LinkArg => {}
-            }
-        }
-    }
-}
-
 fn relevant_lib(sess: &Session, lib: &NativeLib) -> bool {
     match lib.cfg {
         Some(ref cfg) => rustc_attr::cfg_matches(cfg, &sess.parse_sess, CRATE_NODE_ID, None),
diff --git a/compiler/rustc_interface/src/tests.rs b/compiler/rustc_interface/src/tests.rs
index 98eeaad976fe1..08a514bfa3913 100644
--- a/compiler/rustc_interface/src/tests.rs
+++ b/compiler/rustc_interface/src/tests.rs
@@ -763,7 +763,7 @@ fn test_unstable_options_tracking_hash() {
     tracked!(no_profiler_runtime, true);
     tracked!(oom, OomStrategy::Panic);
     tracked!(osx_rpath_install_name, true);
-    tracked!(packed_bundled_libs, true);
+    tracked!(packed_bundled_libs, false);
     tracked!(panic_abort_tests, true);
     tracked!(panic_in_drop, PanicStrategy::Abort);
     tracked!(pick_stable_methods_before_any_unstable, false);
diff --git a/compiler/rustc_metadata/src/native_libs.rs b/compiler/rustc_metadata/src/native_libs.rs
index 9abb5c74895d0..ac42ffd2d089d 100644
--- a/compiler/rustc_metadata/src/native_libs.rs
+++ b/compiler/rustc_metadata/src/native_libs.rs
@@ -471,6 +471,14 @@ impl<'tcx> Collector<'tcx> {
                                 lib.name = Some(Symbol::intern(new_name));
                             }
                             lib.verbatim = passed_lib.verbatim;
+                            if lib.filename.is_none() {
+                                lib.filename = find_bundled_library(
+                                    lib.name,
+                                    lib.verbatim,
+                                    lib.kind,
+                                    self.tcx.sess,
+                                );
+                            }
                             return true;
                         }
                     }
diff --git a/src/test/run-make-fulldeps/invalid-staticlib/Makefile b/src/test/run-make-fulldeps/invalid-staticlib/Makefile
index 3f0f74ce3cb02..340a4f960748d 100644
--- a/src/test/run-make-fulldeps/invalid-staticlib/Makefile
+++ b/src/test/run-make-fulldeps/invalid-staticlib/Makefile
@@ -1,5 +1,7 @@
+# Staticlib format is no longer checked during bundling
+
 include ../tools.mk
 
 all:
 	touch $(TMPDIR)/libfoo.a
-	echo | $(RUSTC) - --crate-type=rlib -lstatic=foo 2>&1 | $(CGREP) "failed to add native library"
+	$(RUSTC) lib.rs --crate-type=rlib -lstatic=foo
diff --git a/src/test/run-make-fulldeps/invalid-staticlib/lib.rs b/src/test/run-make-fulldeps/invalid-staticlib/lib.rs
new file mode 100644
index 0000000000000..d11c69f812a8d
--- /dev/null
+++ b/src/test/run-make-fulldeps/invalid-staticlib/lib.rs
@@ -0,0 +1 @@
+// intentionally empty
diff --git a/src/test/run-make-fulldeps/link-dedup/Makefile b/src/test/run-make-fulldeps/link-dedup/Makefile
index 5c9603352989a..1bc2cb62f953c 100644
--- a/src/test/run-make-fulldeps/link-dedup/Makefile
+++ b/src/test/run-make-fulldeps/link-dedup/Makefile
@@ -6,7 +6,7 @@ all:
 	$(RUSTC) depa.rs
 	$(RUSTC) depb.rs
 	$(RUSTC) depc.rs
-	$(RUSTC) empty.rs --cfg bar 2>&1 | $(CGREP) '"-ltesta" "-ltestb" "-ltesta"'
+	$(RUSTC) empty.rs --cfg bar 2>&1 | $(CGREP) -e '"-ltesta".*"-ltestb".*"-ltesta"'
 	$(RUSTC) empty.rs 2>&1 | $(CGREP) '"-ltesta"'
 	$(RUSTC) empty.rs 2>&1 | $(CGREP) -v '"-ltestb"'
 	$(RUSTC) empty.rs 2>&1 | $(CGREP) -v '"-ltesta" "-ltesta"'
diff --git a/src/test/run-make/native-link-modifier-bundle/Makefile b/src/test/run-make/native-link-modifier-bundle/Makefile
index 7c78d7783e0b6..a71a94d6209d2 100644
--- a/src/test/run-make/native-link-modifier-bundle/Makefile
+++ b/src/test/run-make/native-link-modifier-bundle/Makefile
@@ -12,7 +12,7 @@ all: $(call NATIVE_STATICLIB,native-staticlib)
 	$(RUSTC) bundled.rs --crate-type=staticlib --crate-type=rlib
 	$(NM) $(TMPDIR)/libbundled.a | $(CGREP) -e "T _*native_func"
 	$(NM) $(TMPDIR)/libbundled.a | $(CGREP) -e "U _*native_func"
-	$(NM) $(TMPDIR)/libbundled.rlib | $(CGREP) -e "T _*native_func"
+	$(NM) $(TMPDIR)/libbundled.rlib | $(CGREP) -ve "T _*native_func"
 	$(NM) $(TMPDIR)/libbundled.rlib | $(CGREP) -e "U _*native_func"
 
 	# Build a staticlib and a rlib, the `native_func` symbol will not be bundled into it
diff --git a/src/test/ui/native-library-link-flags/auxiliary/mylib.rs b/src/test/ui/native-library-link-flags/auxiliary/mylib.rs
new file mode 100644
index 0000000000000..3adb34c56fccb
--- /dev/null
+++ b/src/test/ui/native-library-link-flags/auxiliary/mylib.rs
@@ -0,0 +1,3 @@
+// no-prefer-dynamic
+
+#![crate_type = "staticlib"]
diff --git a/src/test/ui/native-library-link-flags/mix-bundle-and-whole-archive-link-attr.rs b/src/test/ui/native-library-link-flags/mix-bundle-and-whole-archive-link-attr.rs
index 066048795c8a2..97a1eb457f8f2 100644
--- a/src/test/ui/native-library-link-flags/mix-bundle-and-whole-archive-link-attr.rs
+++ b/src/test/ui/native-library-link-flags/mix-bundle-and-whole-archive-link-attr.rs
@@ -1,8 +1,10 @@
-// compile-flags: -Zunstable-options --crate-type rlib
-// build-fail
-// error-pattern: the linking modifiers `+bundle` and `+whole-archive` are not compatible with each other when generating rlibs
+// Mixing +bundle and +whole-archive is now allowed
+
+// build-pass
+// compile-flags: --crate-type rlib
+// aux-build:mylib.rs
 
 #[link(name = "mylib", kind = "static", modifiers = "+bundle,+whole-archive")]
-extern "C" { }
+extern "C" {}
 
-fn main() { }
+fn main() {}
diff --git a/src/test/ui/native-library-link-flags/mix-bundle-and-whole-archive-link-attr.stderr b/src/test/ui/native-library-link-flags/mix-bundle-and-whole-archive-link-attr.stderr
deleted file mode 100644
index 246efb8d627cb..0000000000000
--- a/src/test/ui/native-library-link-flags/mix-bundle-and-whole-archive-link-attr.stderr
+++ /dev/null
@@ -1,6 +0,0 @@
-error: the linking modifiers `+bundle` and `+whole-archive` are not compatible with each other when generating rlibs
-
-error: could not find native static library `mylib`, perhaps an -L flag is missing?
-
-error: aborting due to 2 previous errors
-
diff --git a/src/test/ui/native-library-link-flags/mix-bundle-and-whole-archive.rs b/src/test/ui/native-library-link-flags/mix-bundle-and-whole-archive.rs
index 1d0768d99cffd..458404a1e2aed 100644
--- a/src/test/ui/native-library-link-flags/mix-bundle-and-whole-archive.rs
+++ b/src/test/ui/native-library-link-flags/mix-bundle-and-whole-archive.rs
@@ -1,7 +1,7 @@
-// Mixing +bundle and +whole-archive is not allowed
+// Mixing +bundle and +whole-archive is now allowed
 
-// compile-flags: -l static:+bundle,+whole-archive=mylib -Zunstable-options --crate-type rlib
-// build-fail
-// error-pattern: the linking modifiers `+bundle` and `+whole-archive` are not compatible with each other when generating rlibs
+// build-pass
+// compile-flags: --crate-type rlib -l static:+bundle,+whole-archive=mylib
+// aux-build:mylib.rs
 
-fn main() { }
+fn main() {}
diff --git a/src/test/ui/native-library-link-flags/mix-bundle-and-whole-archive.stderr b/src/test/ui/native-library-link-flags/mix-bundle-and-whole-archive.stderr
deleted file mode 100644
index 246efb8d627cb..0000000000000
--- a/src/test/ui/native-library-link-flags/mix-bundle-and-whole-archive.stderr
+++ /dev/null
@@ -1,6 +0,0 @@
-error: the linking modifiers `+bundle` and `+whole-archive` are not compatible with each other when generating rlibs
-
-error: could not find native static library `mylib`, perhaps an -L flag is missing?
-
-error: aborting due to 2 previous errors
-