Merging upstream version 1.70.0+dfsg1.

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

4 files changed, 27 insertions, 0 deletions

diff --git a/tests/run-make/no-duplicate-libs/Makefile b/tests/run-make/no-duplicate-libs/Makefile
new file mode 100644
index 000000000..4be8c0262
--- /dev/null
+++ b/tests/run-make/no-duplicate-libs/Makefile
@@ -0,0 +1,11 @@
+# ignore-cross-compile
+include ../tools.mk
+
+ifdef IS_MSVC
+# FIXME(#27979)
+all:
+else
+all: $(call STATICLIB,foo) $(call STATICLIB,bar)
+	$(RUSTC) main.rs
+	$(call RUN,main)
+endif
diff --git a/tests/run-make/no-duplicate-libs/bar.c b/tests/run-make/no-duplicate-libs/bar.c
new file mode 100644
index 000000000..e36952657
--- /dev/null
+++ b/tests/run-make/no-duplicate-libs/bar.c
@@ -0,0 +1,5 @@
+extern void foo();
+
+void bar() {
+  foo();
+}
diff --git a/tests/run-make/no-duplicate-libs/foo.c b/tests/run-make/no-duplicate-libs/foo.c
new file mode 100644
index 000000000..85e6cd8c3
--- /dev/null
+++ b/tests/run-make/no-duplicate-libs/foo.c
@@ -0,0 +1 @@
+void foo() {}
diff --git a/tests/run-make/no-duplicate-libs/main.rs b/tests/run-make/no-duplicate-libs/main.rs
new file mode 100644
index 000000000..b25ef35ad
--- /dev/null
+++ b/tests/run-make/no-duplicate-libs/main.rs
@@ -0,0 +1,10 @@
+#[link(name = "foo")] // linker should drop this library, no symbols used
+#[link(name = "bar")] // symbol comes from this library
+#[link(name = "foo")] // now linker picks up `foo` b/c `bar` library needs it
+extern "C" {
+    fn bar();
+}
+
+fn main() {
+    unsafe { bar() }
+}