Merging upstream version 1.70.0+dfsg1.

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

4 files changed, 0 insertions, 31 deletions

diff --git a/tests/run-make-fulldeps/c-dynamic-dylib/Makefile b/tests/run-make-fulldeps/c-dynamic-dylib/Makefile
deleted file mode 100644
index ac6877892..000000000
--- a/tests/run-make-fulldeps/c-dynamic-dylib/Makefile
+++ /dev/null
@@ -1,12 +0,0 @@
-include ../tools.mk
-
-# ignore-macos
-#
-# This hits an assertion in the linker on older versions of osx apparently
-
-all: $(call DYLIB,cfoo)
-	$(RUSTC) foo.rs -C prefer-dynamic
-	$(RUSTC) bar.rs
-	$(call RUN,bar)
-	$(call REMOVE_DYLIBS,cfoo)
-	$(call FAIL,bar)
diff --git a/tests/run-make-fulldeps/c-dynamic-dylib/bar.rs b/tests/run-make-fulldeps/c-dynamic-dylib/bar.rs
deleted file mode 100644
index b8c798ffd..000000000
--- a/tests/run-make-fulldeps/c-dynamic-dylib/bar.rs
+++ /dev/null
@@ -1,5 +0,0 @@
-extern crate foo;
-
-fn main() {
-    foo::rsfoo();
-}
diff --git a/tests/run-make-fulldeps/c-dynamic-dylib/cfoo.c b/tests/run-make-fulldeps/c-dynamic-dylib/cfoo.c
deleted file mode 100644
index fea490cf9..000000000
--- a/tests/run-make-fulldeps/c-dynamic-dylib/cfoo.c
+++ /dev/null
@@ -1,4 +0,0 @@
-#ifdef _WIN32
-__declspec(dllexport)
-#endif
-int foo() { return 0; }
diff --git a/tests/run-make-fulldeps/c-dynamic-dylib/foo.rs b/tests/run-make-fulldeps/c-dynamic-dylib/foo.rs
deleted file mode 100644
index 9f7a9e221..000000000
--- a/tests/run-make-fulldeps/c-dynamic-dylib/foo.rs
+++ /dev/null
@@ -1,10 +0,0 @@
-#![crate_type = "dylib"]
-
-#[link(name = "cfoo")]
-extern "C" {
-    fn foo();
-}
-
-pub fn rsfoo() {
-    unsafe { foo() }
-}