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/mixing-libs/Makefile b/tests/run-make/mixing-libs/Makefile
new file mode 100644
index 000000000..e8262b284
--- /dev/null
+++ b/tests/run-make/mixing-libs/Makefile
@@ -0,0 +1,10 @@
+# ignore-cross-compile
+include ../tools.mk
+
+all:
+	$(RUSTC) rlib.rs
+	$(RUSTC) dylib.rs
+	$(RUSTC) rlib.rs --crate-type=dylib
+	$(RUSTC) dylib.rs
+	$(call REMOVE_DYLIBS,rlib)
+	$(RUSTC) prog.rs && exit 1 || exit 0
diff --git a/tests/run-make/mixing-libs/dylib.rs b/tests/run-make/mixing-libs/dylib.rs
new file mode 100644
index 000000000..685688750
--- /dev/null
+++ b/tests/run-make/mixing-libs/dylib.rs
@@ -0,0 +1,4 @@
+#![crate_type = "dylib"]
+extern crate rlib;
+
+pub fn dylib() { rlib::rlib() }
diff --git a/tests/run-make/mixing-libs/prog.rs b/tests/run-make/mixing-libs/prog.rs
new file mode 100644
index 000000000..14ce5c951
--- /dev/null
+++ b/tests/run-make/mixing-libs/prog.rs
@@ -0,0 +1,7 @@
+extern crate dylib;
+extern crate rlib;
+
+fn main() {
+    dylib::dylib();
+    rlib::rlib();
+}
diff --git a/tests/run-make/mixing-libs/rlib.rs b/tests/run-make/mixing-libs/rlib.rs
new file mode 100644
index 000000000..96dcd16bb
--- /dev/null
+++ b/tests/run-make/mixing-libs/rlib.rs
@@ -0,0 +1,2 @@
+#![crate_type = "rlib"]
+pub fn rlib() {}