Merging upstream version 1.70.0+dfsg1.

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

5 files changed, 0 insertions, 39 deletions

diff --git a/tests/run-make-fulldeps/link-dedup/Makefile b/tests/run-make-fulldeps/link-dedup/Makefile
deleted file mode 100644
index eff18ab48..000000000
--- a/tests/run-make-fulldeps/link-dedup/Makefile
+++ /dev/null
@@ -1,12 +0,0 @@
-# ignore-msvc
-
-include ../tools.mk
-
-all:
-	$(RUSTC) depa.rs
-	$(RUSTC) depb.rs
-	$(RUSTC) depc.rs
-	$(RUSTC) empty.rs --cfg bar 2>&1 | $(CGREP) '"-ltesta" "-ltestb" "-ltesta"'
-	$(RUSTC) empty.rs 2>&1 | $(CGREP) '"-ltesta"'
-	$(RUSTC) empty.rs 2>&1 | $(CGREP) -v '"-ltestb"'
-	$(RUSTC) empty.rs 2>&1 | $(CGREP) -v '"-ltesta" "-ltesta" "-ltesta"'
diff --git a/tests/run-make-fulldeps/link-dedup/depa.rs b/tests/run-make-fulldeps/link-dedup/depa.rs
deleted file mode 100644
index 19178c5bd..000000000
--- a/tests/run-make-fulldeps/link-dedup/depa.rs
+++ /dev/null
@@ -1,10 +0,0 @@
-#![crate_type = "rlib"]
-
-#[link(name = "testa")]
-extern "C" {}
-
-#[link(name = "testa")]
-extern "C" {}
-
-#[link(name = "testa")]
-extern "C" {}
diff --git a/tests/run-make-fulldeps/link-dedup/depb.rs b/tests/run-make-fulldeps/link-dedup/depb.rs
deleted file mode 100644
index b1be21fe0..000000000
--- a/tests/run-make-fulldeps/link-dedup/depb.rs
+++ /dev/null
@@ -1,8 +0,0 @@
-#![feature(link_cfg)]
-#![crate_type = "rlib"]
-
-#[link(name = "testb", cfg(foo))]
-extern "C" {}
-
-#[link(name = "testb", cfg(bar))]
-extern "C" {}
diff --git a/tests/run-make-fulldeps/link-dedup/depc.rs b/tests/run-make-fulldeps/link-dedup/depc.rs
deleted file mode 100644
index 8dcb3dee5..000000000
--- a/tests/run-make-fulldeps/link-dedup/depc.rs
+++ /dev/null
@@ -1,4 +0,0 @@
-#![crate_type = "rlib"]
-
-#[link(name = "testa")]
-extern "C" {}
diff --git a/tests/run-make-fulldeps/link-dedup/empty.rs b/tests/run-make-fulldeps/link-dedup/empty.rs
deleted file mode 100644
index e00ae18f4..000000000
--- a/tests/run-make-fulldeps/link-dedup/empty.rs
+++ /dev/null
@@ -1,5 +0,0 @@
-extern crate depa;
-extern crate depb;
-extern crate depc;
-
-fn main() {}