Merging upstream version 1.70.0+dfsg1.

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

4 files changed, 0 insertions, 25 deletions

diff --git a/tests/run-make-fulldeps/c-static-dylib/Makefile b/tests/run-make-fulldeps/c-static-dylib/Makefile
deleted file mode 100644
index 5b78005e3..000000000
--- a/tests/run-make-fulldeps/c-static-dylib/Makefile
+++ /dev/null
@@ -1,9 +0,0 @@
-include ../tools.mk
-
-all: $(call NATIVE_STATICLIB,cfoo)
-	$(RUSTC) foo.rs -C prefer-dynamic
-	$(RUSTC) bar.rs
-	rm $(call NATIVE_STATICLIB,cfoo)
-	$(call RUN,bar)
-	$(call REMOVE_DYLIBS,foo)
-	$(call FAIL,bar)
diff --git a/tests/run-make-fulldeps/c-static-dylib/bar.rs b/tests/run-make-fulldeps/c-static-dylib/bar.rs
deleted file mode 100644
index b8c798ffd..000000000
--- a/tests/run-make-fulldeps/c-static-dylib/bar.rs
+++ /dev/null
@@ -1,5 +0,0 @@
-extern crate foo;
-
-fn main() {
-    foo::rsfoo();
-}
diff --git a/tests/run-make-fulldeps/c-static-dylib/cfoo.c b/tests/run-make-fulldeps/c-static-dylib/cfoo.c
deleted file mode 100644
index 9fe07f82f..000000000
--- a/tests/run-make-fulldeps/c-static-dylib/cfoo.c
+++ /dev/null
@@ -1 +0,0 @@
-int foo() { return 0; }
diff --git a/tests/run-make-fulldeps/c-static-dylib/foo.rs b/tests/run-make-fulldeps/c-static-dylib/foo.rs
deleted file mode 100644
index 1e8af4d44..000000000
--- a/tests/run-make-fulldeps/c-static-dylib/foo.rs
+++ /dev/null
@@ -1,10 +0,0 @@
-#![crate_type = "dylib"]
-
-#[link(name = "cfoo", kind = "static")]
-extern "C" {
-    fn foo();
-}
-
-pub fn rsfoo() {
-    unsafe { foo() }
-}