Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
4 changes: 3 additions & 1 deletion libwild/src/args.rs
Original file line number Diff line number Diff line change
Expand Up @@ -1476,15 +1476,17 @@ fn setup_argument_parser() -> ArgumentParser {
.help("Create a position-independent executable")
.execute(|args, _modifier_stack| {
args.relocation_model = RelocationModel::Relocatable;
args.output_kind = None;
Ok(())
});

parser
.declare()
.long("no-pie")
.help("Create a position-dependent executable (default)")
.help("Do not create a position-dependent executable (default)")
.execute(|args, _modifier_stack| {
args.relocation_model = RelocationModel::NonRelocatable;
args.output_kind = None;
Ok(())
});

Expand Down
3 changes: 2 additions & 1 deletion wild/tests/integration_tests.rs
Original file line number Diff line number Diff line change
Expand Up @@ -2562,7 +2562,8 @@ fn integration_test(
"unresolved-symbols-object.c",
"unresolved-symbols-shared.c",
"lto-undefined.c",
"symbol-version-symver.c"
"symbol-version-symver.c",
"args-precedence.c"
)]
program_name: &'static str,
#[allow(unused_variables)] setup_symlink: (),
Expand Down
20 changes: 20 additions & 0 deletions wild/tests/sources/args-precedence.c
Original file line number Diff line number Diff line change
@@ -0,0 +1,20 @@
// Extracted from https://github.com/rust-lang/rust/issues/146780
//#Config:pie-over-shared
//#LinkArgs:-shared -z now -pie
//#DiffIgnore:.dynamic.DT_RELA*
// We're linking different .so files, so this is expected.
//#DiffIgnore:.dynamic.DT_NEEDED
//#DiffIgnore:section.got
//#Shared:runtime.c
//#Mode:dynamic

//#Config:no-pie-over-shared
//#LinkArgs:-shared -z now -no-pie
//#Object:runtime.c

#include "runtime.h"

void _start(void) {
runtime_init();
exit_syscall(42);
}