Skip to content
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.

Commit 01a2662

Browse files
committedJul 30, 2024
rewrite and rename issue-69368 to rmake
1 parent 61a6afe commit 01a2662

File tree

8 files changed

+28
-24
lines changed

8 files changed

+28
-24
lines changed
 

‎src/tools/compiletest/src/command-list.rs

+1
Original file line numberDiff line numberDiff line change
@@ -117,6 +117,7 @@ const KNOWN_DIRECTIVE_NAMES: &[&str] = &[
117117
"ignore-watchos",
118118
"ignore-windows",
119119
"ignore-windows-gnu",
120+
"ignore-windows-msvc",
120121
"ignore-x32",
121122
"ignore-x86",
122123
"ignore-x86_64",

‎src/tools/tidy/src/allowed_run_make_makefiles.txt

-1
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,6 @@ run-make/foreign-exceptions/Makefile
1818
run-make/foreign-rust-exceptions/Makefile
1919
run-make/incr-add-rust-src-component/Makefile
2020
run-make/issue-36710/Makefile
21-
run-make/issue-69368/Makefile
2221
run-make/issue-84395-lto-embed-bitcode/Makefile
2322
run-make/issue-88756-default-output/Makefile
2423
run-make/jobserver-error/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

+7-4
Original file line numberDiff line numberDiff line change
@@ -4,17 +4,20 @@
44
// after the fix in #85395.
55
// See https://github.com/rust-lang/rust/issues/47551
66

7-
//FIXME(Oneirical): See if it works on anything other than only linux and 64 bit
8-
// maybe riscv64gc-unknown-linux-gnu
7+
//@ only-linux
8+
// Reason: the ZERO terminator is unique to the Linux architecture.
9+
//@ ignore-32bit
10+
// Reason: the usage of a large array in the test causes an out-of-memory
11+
// error on 32 bit systems.
912

10-
use run_make_support::{llvm_objdump, run, rustc};
13+
use run_make_support::{bin_name, llvm_objdump, run, rustc};
1114

1215
fn main() {
1316
rustc().input("eh_frame-terminator.rs").run();
1417
run("eh_frame-terminator").assert_stdout_contains("1122334455667788");
1518
llvm_objdump()
1619
.arg("--dwarf=frames")
17-
.input("eh_frame-terminator")
20+
.input(bin_name("eh_frame-terminator"))
1821
.run()
1922
.assert_stdout_contains("ZERO terminator");
2023
}

0 commit comments

Comments
 (0)
Failed to load comments.