Skip to content

Don't assume that -Bdynamic is the default linker mode #111694

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
May 24, 2023
Merged

Don't assume that -Bdynamic is the default linker mode #111694

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
24 changes: 12 additions & 12 deletions compiler/rustc_codegen_ssa/src/back/linker.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -144,7 +144,7 @@ pub fn get_linker<'a>(
cmd,
sess,
target_cpu,
hinted_static: false,
hinted_static: None,
is_ld: cc == Cc::No,
is_gnu: flavor.is_gnu(),
}) as Box<dyn Linker>,
Expand Down Expand Up @@ -214,7 +214,7 @@ pub struct GccLinker<'a> {
cmd: Command,
sess: &'a Session,
target_cpu: &'a str,
hinted_static: bool, // Keeps track of the current hinting mode.
hinted_static: Option<bool>, // Keeps track of the current hinting mode.
// Link as ld
is_ld: bool,
is_gnu: bool,
Expand Down Expand Up @@ -275,19 +275,19 @@ impl<'a> GccLinker<'a> {
if !self.takes_hints() {
return;
}
if !self.hinted_static {
if self.hinted_static != Some(true) {
self.linker_arg("-Bstatic");
self.hinted_static = true;
self.hinted_static = Some(true);
}
}

fn hint_dynamic(&mut self) {
if !self.takes_hints() {
return;
}
if self.hinted_static {
if self.hinted_static != Some(false) {
self.linker_arg("-Bdynamic");
self.hinted_static = false;
self.hinted_static = Some(false);
}
}

Expand Down Expand Up @@ -1484,25 +1484,25 @@ impl<'a> L4Bender<'a> {
pub struct AixLinker<'a> {
cmd: Command,
sess: &'a Session,
hinted_static: bool,
hinted_static: Option<bool>,
}

impl<'a> AixLinker<'a> {
pub fn new(cmd: Command, sess: &'a Session) -> AixLinker<'a> {
AixLinker { cmd: cmd, sess: sess, hinted_static: false }
AixLinker { cmd: cmd, sess: sess, hinted_static: None }
}

fn hint_static(&mut self) {
if !self.hinted_static {
if self.hinted_static != Some(true) {
self.cmd.arg("-bstatic");
self.hinted_static = true;
self.hinted_static = Some(true);
}
}

fn hint_dynamic(&mut self) {
if self.hinted_static {
if self.hinted_static != Some(false) {
self.cmd.arg("-bdynamic");
self.hinted_static = false;
self.hinted_static = Some(false);
}
}

Expand Down