bjoernager/rust
bjoernager/rust
1
Fork 0
Code Activity

linker: Re-apply Solaris fixes for -z ignore

Browse source
This commit is contained in:
Vadim Petrochenkov 2021-06-06 17:48:18 +03:00
parent 5275bf1c1d
commit 3eab280567
1 changed files with 10 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

15
compiler/rustc_codegen_ssa/src/back/link.rs
View file

@ -1764,11 +1764,6 @@ fn linker_with_args<'a, B: ArchiveBuilder<'a>>(
// ------------ Early order-dependent options ------------ // ------------ Early order-dependent options ------------
// Avoid linking to dynamic libraries unless they satisfy some undefined symbols
// at the point at which they are specified on the command line.
// Must be passed before any (dynamic) libraries to have effect on them.
cmd.add_as_needed();
// If we're building something like a dynamic library then some platforms // If we're building something like a dynamic library then some platforms
// need to make sure that all symbols are exported correctly from the // need to make sure that all symbols are exported correctly from the
// dynamic library. // dynamic library.
@ -1822,6 +1817,16 @@ fn linker_with_args<'a, B: ArchiveBuilder<'a>>(
add_local_crate_metadata_objects(cmd, crate_type, codegen_results); add_local_crate_metadata_objects(cmd, crate_type, codegen_results);
add_local_crate_allocator_objects(cmd, codegen_results); add_local_crate_allocator_objects(cmd, codegen_results);
// Avoid linking to dynamic libraries unless they satisfy some undefined symbols
// at the point at which they are specified on the command line.
// Must be passed before any (dynamic) libraries to have effect on them.
// On Solaris-like systems, `-z ignore` acts as both `--as-needed` and `--gc-sections`
// so it will ignore unreferenced ELF sections from relocatable objects.
// For that reason, we put this flag after metadata objects as they would otherwise be removed.
// FIXME: Support more fine-grained dead code removal on Solaris/illumos
// and move this option back to the top.
cmd.add_as_needed();
// FIXME: Move this below to other native libraries // FIXME: Move this below to other native libraries
// (or alternatively link all native libraries after their respective crates). // (or alternatively link all native libraries after their respective crates).
// This change is somewhat breaking in practice due to local static libraries being linked // This change is somewhat breaking in practice due to local static libraries being linked