Merging upstream version 1.70.0+dfsg1.

Signed-off-by: Daniel Baumann <daniel.baumann@progress-linux.org>

4 files changed, 23 insertions, 0 deletions

diff --git a/tests/run-make/issue-15460/Makefile b/tests/run-make/issue-15460/Makefile
new file mode 100644
index 000000000..a36a085fa
--- /dev/null
+++ b/tests/run-make/issue-15460/Makefile
@@ -0,0 +1,7 @@
+# ignore-cross-compile
+include ../tools.mk
+
+all: $(call NATIVE_STATICLIB,foo)
+	$(RUSTC) foo.rs -C extra-filename=-383hf8 -C prefer-dynamic
+	$(RUSTC) bar.rs
+	$(call RUN,bar)
diff --git a/tests/run-make/issue-15460/bar.rs b/tests/run-make/issue-15460/bar.rs
new file mode 100644
index 000000000..e66aeb6bd
--- /dev/null
+++ b/tests/run-make/issue-15460/bar.rs
@@ -0,0 +1,4 @@
+extern crate foo;
+fn main() {
+    unsafe { foo::foo() }
+}
diff --git a/tests/run-make/issue-15460/foo.c b/tests/run-make/issue-15460/foo.c
new file mode 100644
index 000000000..fdf595b57
--- /dev/null
+++ b/tests/run-make/issue-15460/foo.c
@@ -0,0 +1,6 @@
+// ignore-license
+
+#ifdef _WIN32
+__declspec(dllexport)
+#endif
+void foo() {}
diff --git a/tests/run-make/issue-15460/foo.rs b/tests/run-make/issue-15460/foo.rs
new file mode 100644
index 000000000..b4eaa0b31
--- /dev/null
+++ b/tests/run-make/issue-15460/foo.rs
@@ -0,0 +1,6 @@
+#![crate_type = "dylib"]
+
+#[link(name = "foo", kind = "static")]
+extern "C" {
+    pub fn foo();
+}