[temp] link_natively

Author: belovdv

compiler/rustc_codegen_ssa/src/back/link.rs

@@ -354,7 +354,9 @@ fn link_rlib<'a>(
             continue;
         };
         if flavor == RlibFlavor::Normal
-            && (sess.opts.unstable_opts.packed_bundled_libs || whole_archive == Some(true))
+            && (sess.opts.unstable_opts.packed_bundled_libs
+                || whole_archive == Some(true)
+                || lib.cfg.is_some())
         {
             let name = lib.filename.unwrap();
             let path = find_native_static_library(name.as_str(), true, &lib_search_paths, sess);
@@ -525,7 +527,7 @@ fn link_staticlib<'a>(
                 false
             }),
         )
-        .unwrap(); // It may be error?
+        .unwrap();
 
         let bundled: FxHashSet<_> = native_libs.iter().filter_map(|lib| lib.filename).collect();
         archive_builder_builder
@@ -2547,20 +2549,8 @@ fn add_static_crate<'a>(
         cmd.link_rlib(&fix_windows_verbatim_for_gcc(path));
     };
 
-    // See the comment above in `link_staticlib` and `link_rlib` for why if
-    // there's a static library that's not relevant we skip all object
-    // files.
-    let native_libs = &codegen_results.crate_info.native_libraries[&cnum];
-    let skip_native = native_libs.iter().any(|lib| {
-        matches!(lib.kind, NativeLibKind::Static { bundle: None | Some(true), .. })
-            && !relevant_lib(sess, lib)
-    });
-    let _ = skip_native;
-    let skip_native = false;
-
-    if (!are_upstream_rust_objects_already_included(sess)
-        || ignored_for_lto(sess, &codegen_results.crate_info, cnum))
-        && !skip_native
+    if !are_upstream_rust_objects_already_included(sess)
+        || ignored_for_lto(sess, &codegen_results.crate_info, cnum)
     {
         link_upstream(cratepath);
         return;
@@ -2591,17 +2581,13 @@ fn add_static_crate<'a>(
                 let is_rust_object =
                     canonical.starts_with(&canonical_name) && looks_like_rust_object_file(&f);
 
-                // If we've been requested to skip all native object files
-                // (those not generated by the rust compiler) then we can skip
-                // this file. See above for why we may want to do this.
-                let skip_because_cfg_say_so = skip_native && !is_rust_object;
-
                 // If we're performing LTO and this is a rust-generated object
                 // file, then we don't need the object file as it's part of the
                 // LTO module. Note that `#![no_builtins]` is excluded from LTO,
                 // though, so we let that object file slide.
-                let skip_because_lto =
-                    upstream_rust_objects_already_included && is_rust_object && is_builtins;
+                if upstream_rust_objects_already_included && is_rust_object && is_builtins {
+                    return true;
+                }
 
                 // We skip native libraries because:
                 // 1. This native libraries won't be used from the generated rlib,
@@ -2612,10 +2598,6 @@ fn add_static_crate<'a>(
                     return true;
                 }
 
-                if skip_because_cfg_say_so || skip_because_lto {
-                    return true;
-                }
-
                 false
             }),
         ) {

compiler/rustc_metadata/src/native_libs.rs

@@ -59,17 +59,28 @@ fn find_bundled_library(
     name: Option<Symbol>,
     verbatim: Option<bool>,
     kind: NativeLibKind,
+    cfg: &Option<rustc_ast::MetaItem>,
     sess: &Session,
 ) -> Option<Symbol> {
-    if sess.opts.unstable_opts.packed_bundled_libs &&
-            sess.crate_types().iter().any(|ct| ct == &CrateType::Rlib || ct == &CrateType::Staticlib) &&
-            let NativeLibKind::Static { bundle: Some(true) | None, .. } = kind {
+    let NativeLibKind::Static { bundle: Some(true) | None, whole_archive } = kind else {
+        return None
+    };
+    if !sess.crate_types().iter().any(|ct| ct == &CrateType::Rlib || ct == &CrateType::Staticlib) {
+        return None;
+    }
+    if sess.opts.unstable_opts.packed_bundled_libs
+        || cfg.is_some()
+        || whole_archive.unwrap_or(false)
+    {
         find_native_static_library(
             name.unwrap().as_str(),
             verbatim.unwrap_or(false),
             &sess.target_filesearch(PathKind::Native).search_path_dirs(),
             sess,
-        ).file_name().and_then(|s| s.to_str()).map(Symbol::intern)
+        )
+        .file_name()
+        .and_then(|s| s.to_str())
+        .map(Symbol::intern)
     } else {
         None
     }
@@ -393,7 +404,7 @@ impl<'tcx> Collector<'tcx> {
 
             let name = name.map(|(name, _)| name);
             let kind = kind.unwrap_or(NativeLibKind::Unspecified);
-            let filename = find_bundled_library(name, verbatim, kind, sess);
+            let filename = find_bundled_library(name, verbatim, kind, &cfg, sess);
             self.libs.push(NativeLib {
                 name,
                 filename,
@@ -479,12 +490,12 @@ impl<'tcx> Collector<'tcx> {
                 let new_name: Option<&str> = passed_lib.new_name.as_deref();
                 let name = Some(Symbol::intern(new_name.unwrap_or(&passed_lib.name)));
                 let sess = self.tcx.sess;
-                let filename =
-                    find_bundled_library(name, passed_lib.verbatim, passed_lib.kind, sess);
+                let kind = passed_lib.kind;
+                let filename = find_bundled_library(name, passed_lib.verbatim, kind, &None, sess);
                 self.libs.push(NativeLib {
                     name,
                     filename,
-                    kind: passed_lib.kind,
+                    kind,
                     cfg: None,
                     foreign_module: None,
                     wasm_import_module: None,