Skip to content

Commit 6d3fdb5

Browse files
authored
Rollup merge of rust-lang#145112 - dpaoliello:raw-dylib-link-ordinal, r=jieyouxu
[win][arm64ec] Partial fix for raw-dylib-link-ordinal on Arm64EC These are the test fixes required to get `raw-dylib-link-ordinal` working on Arm64EC. For the test to completely pass, we also need an updated `ar_archive_writer` with <rust-lang/ar_archive_writer#24> merged in.
2 parents 169b088 + dcc1605 commit 6d3fdb5

File tree

2 files changed

+3
-2
lines changed

2 files changed

+3
-2
lines changed
Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
LIBRARY exporter
22
EXPORTS
33
exported_function @13 NONAME
4-
exported_variable @5 NONAME
4+
exported_variable @5 NONAME DATA
55
print_exported_variable @9 NONAME

tests/run-make/raw-dylib-link-ordinal/rmake.rs

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@
1111

1212
//@ only-windows
1313

14-
use run_make_support::{cc, diff, is_windows_msvc, run, rustc};
14+
use run_make_support::{cc, diff, extra_c_flags, is_windows_msvc, run, rustc};
1515

1616
// NOTE: build_native_dynamic lib is not used, as the special `def` files
1717
// must be passed to the CC compiler.
@@ -24,6 +24,7 @@ fn main() {
2424
cc().input("exporter.obj")
2525
.arg("exporter.def")
2626
.args(&["-link", "-dll", "-noimplib", "-out:exporter.dll"])
27+
.args(extra_c_flags())
2728
.run();
2829
} else {
2930
cc().arg("-v").arg("-c").out_exe("exporter.obj").input("exporter.c").run();

0 commit comments

Comments
 (0)