Merging upstream version 1.68.2+dfsg1.

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

5 files changed, 0 insertions, 30 deletions

diff --git a/src/test/run-make-fulldeps/issue-28595/Makefile b/src/test/run-make-fulldeps/issue-28595/Makefile
deleted file mode 100644
index 30a1d9c56..000000000
--- a/src/test/run-make-fulldeps/issue-28595/Makefile
+++ /dev/null
@@ -1,6 +0,0 @@
-include ../tools.mk
-
-all: $(call NATIVE_STATICLIB,a) $(call NATIVE_STATICLIB,b)
-	$(RUSTC) a.rs
-	$(RUSTC) b.rs
-	$(call RUN,b)
diff --git a/src/test/run-make-fulldeps/issue-28595/a.c b/src/test/run-make-fulldeps/issue-28595/a.c
deleted file mode 100644
index 7bfd83cca..000000000
--- a/src/test/run-make-fulldeps/issue-28595/a.c
+++ /dev/null
@@ -1 +0,0 @@
-void a(void) {}
diff --git a/src/test/run-make-fulldeps/issue-28595/a.rs b/src/test/run-make-fulldeps/issue-28595/a.rs
deleted file mode 100644
index 07863cf64..000000000
--- a/src/test/run-make-fulldeps/issue-28595/a.rs
+++ /dev/null
@@ -1,6 +0,0 @@
-#![crate_type = "rlib"]
-
-#[link(name = "a", kind = "static")]
-extern "C" {
-    pub fn a();
-}
diff --git a/src/test/run-make-fulldeps/issue-28595/b.c b/src/test/run-make-fulldeps/issue-28595/b.c
deleted file mode 100644
index 6aecb5f9e..000000000
--- a/src/test/run-make-fulldeps/issue-28595/b.c
+++ /dev/null
@@ -1,5 +0,0 @@
-extern void a(void);
-
-void b(void) {
-    a();
-}
diff --git a/src/test/run-make-fulldeps/issue-28595/b.rs b/src/test/run-make-fulldeps/issue-28595/b.rs
deleted file mode 100644
index 1f389859f..000000000
--- a/src/test/run-make-fulldeps/issue-28595/b.rs
+++ /dev/null
@@ -1,12 +0,0 @@
-extern crate a;
-
-#[link(name = "b", kind = "static")]
-extern "C" {
-    pub fn b();
-}
-
-fn main() {
-    unsafe {
-        b();
-    }
-}