Merging upstream version 1.70.0+dfsg1.

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

6 files changed, 51 insertions, 0 deletions

diff --git a/tests/run-make/interdependent-c-libraries/Makefile b/tests/run-make/interdependent-c-libraries/Makefile
new file mode 100644
index 000000000..53a696d82
--- /dev/null
+++ b/tests/run-make/interdependent-c-libraries/Makefile
@@ -0,0 +1,15 @@
+# ignore-cross-compile
+include ../tools.mk
+
+# The rust crate foo will link to the native library foo, while the rust crate
+# bar will link to the native library bar. There is also a dependency between
+# the native library bar to the natibe library foo.
+#
+# This test ensures that the ordering of -lfoo and -lbar on the command line is
+# correct to complete the linkage. If passed as "-lfoo -lbar", then the 'foo'
+# library will be stripped out, and the linkage will fail.
+
+all: $(call NATIVE_STATICLIB,foo) $(call NATIVE_STATICLIB,bar)
+	$(RUSTC) foo.rs
+	$(RUSTC) bar.rs
+	$(RUSTC) main.rs --print link-args
diff --git a/tests/run-make/interdependent-c-libraries/bar.c b/tests/run-make/interdependent-c-libraries/bar.c
new file mode 100644
index 000000000..812c97535
--- /dev/null
+++ b/tests/run-make/interdependent-c-libraries/bar.c
@@ -0,0 +1,3 @@
+void foo();
+
+void bar() { foo(); }
diff --git a/tests/run-make/interdependent-c-libraries/bar.rs b/tests/run-make/interdependent-c-libraries/bar.rs
new file mode 100644
index 000000000..3c2c3f218
--- /dev/null
+++ b/tests/run-make/interdependent-c-libraries/bar.rs
@@ -0,0 +1,14 @@
+#![crate_type = "rlib"]
+
+extern crate foo;
+
+#[link(name = "bar", kind = "static")]
+extern "C" {
+    fn bar();
+}
+
+pub fn doit() {
+    unsafe {
+        bar();
+    }
+}
diff --git a/tests/run-make/interdependent-c-libraries/foo.c b/tests/run-make/interdependent-c-libraries/foo.c
new file mode 100644
index 000000000..85e6cd8c3
--- /dev/null
+++ b/tests/run-make/interdependent-c-libraries/foo.c
@@ -0,0 +1 @@
+void foo() {}
diff --git a/tests/run-make/interdependent-c-libraries/foo.rs b/tests/run-make/interdependent-c-libraries/foo.rs
new file mode 100644
index 000000000..a69809726
--- /dev/null
+++ b/tests/run-make/interdependent-c-libraries/foo.rs
@@ -0,0 +1,12 @@
+#![crate_type = "rlib"]
+
+#[link(name = "foo", kind = "static")]
+extern "C" {
+    fn foo();
+}
+
+pub fn doit() {
+    unsafe {
+        foo();
+    }
+}
diff --git a/tests/run-make/interdependent-c-libraries/main.rs b/tests/run-make/interdependent-c-libraries/main.rs
new file mode 100644
index 000000000..2aba427df
--- /dev/null
+++ b/tests/run-make/interdependent-c-libraries/main.rs
@@ -0,0 +1,6 @@
+extern crate foo;
+extern crate bar;
+
+fn main() {
+    bar::doit();
+}