Skip to content

Commit 0dd0170

Browse files
committed
rewrite and rename issue-69368 to rmake
1 parent 6c21e9c commit 0dd0170

File tree

7 files changed

+22
-23
lines changed

7 files changed

+22
-23
lines changed

src/tools/tidy/src/allowed_run_make_makefiles.txt

-1
Original file line numberDiff line numberDiff line change
@@ -55,7 +55,6 @@ run-make/issue-26006/Makefile
5555
run-make/issue-28595/Makefile
5656
run-make/issue-33329/Makefile
5757
run-make/issue-36710/Makefile
58-
run-make/issue-69368/Makefile
5958
run-make/issue-83045/Makefile
6059
run-make/issue-84395-lto-embed-bitcode/Makefile
6160
run-make/issue-85019-moved-src-dir/Makefile
File renamed without changes.
File renamed without changes.
File renamed without changes.
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,20 @@
1+
// Test that previously triggered a linker failure with root cause
2+
// similar to one found in the issue #69368.
3+
//
4+
// The crate that provides oom lang item is missing some other lang
5+
// items. Necessary to prevent the use of start-group / end-group.
6+
//
7+
// The weak lang items are defined in a separate compilation units,
8+
// so that linker could omit them if not used.
9+
//
10+
// The crates that need those weak lang items are dependencies of
11+
// crates that provide them.
12+
// See https://github.com/rust-lang/rust/issues/69371
13+
14+
use run_make_support::rustc;
15+
16+
fn main() {
17+
rustc().input("a.rs").run();
18+
rustc().input("b.rs").run();
19+
rustc().input("c.rs").run();
20+
}

tests/run-make/issue-69368/Makefile

-19
This file was deleted.

tests/run-make/link-eh-frame-terminator/rmake.rs

+2-3
Original file line numberDiff line numberDiff line change
@@ -5,16 +5,15 @@
55
// See https://github.com/rust-lang/rust/issues/47551
66

77
//FIXME(Oneirical): See if it works on anything other than only linux and 64 bit
8-
// maybe riscv64gc-unknown-linux-gnu
98

10-
use run_make_support::{llvm_objdump, run, rustc};
9+
use run_make_support::{bin_name, llvm_objdump, run, rustc};
1110

1211
fn main() {
1312
rustc().input("eh_frame-terminator.rs").run();
1413
run("eh_frame-terminator").assert_stdout_contains("1122334455667788");
1514
llvm_objdump()
1615
.arg("--dwarf=frames")
17-
.input("eh_frame-terminator")
16+
.input(bin_name("eh_frame-terminator"))
1817
.run()
1918
.assert_stdout_contains("ZERO terminator");
2019
}

0 commit comments

Comments
 (0)