Skip to content

Commit

Permalink
rewrite raw-dylib-stdcall-ordinal to rmake
Browse files Browse the repository at this point in the history
  • Loading branch information
Oneirical committed Jul 23, 2024
1 parent b9ddc2f commit 1358c84
Show file tree
Hide file tree
Showing 4 changed files with 38 additions and 25 deletions.
1 change: 0 additions & 1 deletion src/tools/tidy/src/allowed_run_make_makefiles.txt
Original file line number Diff line number Diff line change
Expand Up @@ -61,7 +61,6 @@ run-make/print-calling-conventions/Makefile
run-make/print-target-list/Makefile
run-make/raw-dylib-alt-calling-convention/Makefile
run-make/raw-dylib-c/Makefile
run-make/raw-dylib-stdcall-ordinal/Makefile
run-make/redundant-libs/Makefile
run-make/remap-path-prefix-dwarf/Makefile
run-make/reproducible-build-2/Makefile
Expand Down
8 changes: 2 additions & 6 deletions tests/run-make/raw-dylib-link-ordinal/rmake.rs
Original file line number Diff line number Diff line change
Expand Up @@ -22,16 +22,12 @@ fn main() {
if is_msvc() {
cc().arg("-c").out_exe("exporter").input("exporter.c").run();
cc().input("exporter.obj")
.arg("exporter.msvc.def")
.arg("exporter.def")
.args(&["-link", "-dll", "-noimplib", "-out:exporter.dll"])
.run();
} else {
cc().arg("-v").arg("-c").out_exe("exporter.obj").input("exporter.c").run();
cc().input("exporter.obj")
.arg("exporter.gnu.def")
.args(&["--no-leading-underscore", "-shared"])
.output("exporter.dll")
.run();
cc().input("exporter.obj").arg("exporter.def").arg("-shared").output("exporter.dll").run();
};
let out = run("driver").stdout_utf8();
diff().expected_file("output.txt").actual_text("actual", out).normalize(r#"\r"#, "").run();
Expand Down
18 changes: 0 additions & 18 deletions tests/run-make/raw-dylib-stdcall-ordinal/Makefile

This file was deleted.

36 changes: 36 additions & 0 deletions tests/run-make/raw-dylib-stdcall-ordinal/rmake.rs
Original file line number Diff line number Diff line change
@@ -0,0 +1,36 @@
// `raw-dylib` is a Windows-specific attribute which emits idata sections for the items in the
// attached extern block,
// so they may be linked against without linking against an import library.
// To learn more, read https://github.com/rust-lang/rfcs/blob/master/text/2627-raw-dylib-kind.md
// Almost identical to `raw-dylib-link-ordinal`, but with the addition of calling conventions,
// such as stdcall.
// See https://github.com/rust-lang/rust/pull/90782

//@ only-x86
//@ only-windows

use run_make_support::{cc, diff, is_msvc, run, rustc};

// NOTE: build_native_dynamic lib is not used, as the special `def` files
// must be passed to the CC compiler.

fn main() {
rustc().crate_type("lib").crate_name("raw_dylib_test").input("lib.rs").run();
rustc().crate_type("bin").input("driver.rs").run();
if is_msvc() {
cc().arg("-c").out_exe("exporter").input("exporter.c").run();
cc().input("exporter.obj")
.arg("exporter-msvc.def")
.args(&["-link", "-dll", "-noimplib", "-out:exporter.dll"])
.run();
} else {
cc().arg("-v").arg("-c").out_exe("exporter.obj").input("exporter.c").run();
cc().input("exporter.obj")
.arg("exporter-gnu.def")
.arg("-shared")
.output("exporter.dll")
.run();
};
let out = run("driver").stdout_utf8();
diff().expected_file("output.txt").actual_text("actual", out).normalize(r#"\r"#, "").run();
}

0 comments on commit 1358c84

Please sign in to comment.