Merging upstream version 1.70.0+dfsg1.

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

5 files changed, 25 insertions, 0 deletions

diff --git a/tests/run-make/manual-link/Makefile b/tests/run-make/manual-link/Makefile
new file mode 100644
index 000000000..8dbf0460f
--- /dev/null
+++ b/tests/run-make/manual-link/Makefile
@@ -0,0 +1,7 @@
+# ignore-cross-compile
+include ../tools.mk
+
+all: $(TMPDIR)/libbar.a
+	$(RUSTC) foo.rs -lstatic=bar
+	$(RUSTC) main.rs
+	$(call RUN,main)
diff --git a/tests/run-make/manual-link/bar.c b/tests/run-make/manual-link/bar.c
new file mode 100644
index 000000000..e42599986
--- /dev/null
+++ b/tests/run-make/manual-link/bar.c
@@ -0,0 +1 @@
+void bar() {}
diff --git a/tests/run-make/manual-link/foo.c b/tests/run-make/manual-link/foo.c
new file mode 100644
index 000000000..e42599986
--- /dev/null
+++ b/tests/run-make/manual-link/foo.c
@@ -0,0 +1 @@
+void bar() {}
diff --git a/tests/run-make/manual-link/foo.rs b/tests/run-make/manual-link/foo.rs
new file mode 100644
index 000000000..c1f28236f
--- /dev/null
+++ b/tests/run-make/manual-link/foo.rs
@@ -0,0 +1,11 @@
+#![crate_type = "rlib"]
+
+extern "C" {
+    fn bar();
+}
+
+pub fn foo() {
+    unsafe {
+        bar();
+    }
+}
diff --git a/tests/run-make/manual-link/main.rs b/tests/run-make/manual-link/main.rs
new file mode 100644
index 000000000..fe35f1f8e
--- /dev/null
+++ b/tests/run-make/manual-link/main.rs
@@ -0,0 +1,5 @@
+extern crate foo;
+
+fn main() {
+    foo::foo();
+}