Merging upstream version 1.68.2+dfsg1.

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

3 files changed, 0 insertions, 30 deletions

diff --git a/src/test/run-make-fulldeps/a-b-a-linker-guard/Makefile b/src/test/run-make-fulldeps/a-b-a-linker-guard/Makefile
deleted file mode 100644
index adc9e3d09..000000000
--- a/src/test/run-make-fulldeps/a-b-a-linker-guard/Makefile
+++ /dev/null
@@ -1,15 +0,0 @@
-include ../tools.mk
-
-# Test that if we build `b` against a version of `a` that has one set
-# of types, it will not run with a dylib that has a different set of
-# types.
-
-# NOTE(eddyb) this test only works with the `legacy` mangling,
-# and will probably get removed once `legacy` is gone.
-
-all:
-	$(RUSTC) a.rs --cfg x -C prefer-dynamic -Z unstable-options -C symbol-mangling-version=legacy
-	$(RUSTC) b.rs -C prefer-dynamic -Z unstable-options -C symbol-mangling-version=legacy
-	$(call RUN,b)
-	$(RUSTC) a.rs --cfg y -C prefer-dynamic -Z unstable-options -C symbol-mangling-version=legacy
-	$(call FAIL,b)
diff --git a/src/test/run-make-fulldeps/a-b-a-linker-guard/a.rs b/src/test/run-make-fulldeps/a-b-a-linker-guard/a.rs
deleted file mode 100644
index aa07b1e71..000000000
--- a/src/test/run-make-fulldeps/a-b-a-linker-guard/a.rs
+++ /dev/null
@@ -1,8 +0,0 @@
-#![crate_name = "a"]
-#![crate_type = "dylib"]
-
-#[cfg(x)]
-pub fn foo(x: u32) { }
-
-#[cfg(y)]
-pub fn foo(x: i32) { }
diff --git a/src/test/run-make-fulldeps/a-b-a-linker-guard/b.rs b/src/test/run-make-fulldeps/a-b-a-linker-guard/b.rs
deleted file mode 100644
index f30df120a..000000000
--- a/src/test/run-make-fulldeps/a-b-a-linker-guard/b.rs
+++ /dev/null
@@ -1,7 +0,0 @@
-#![crate_name = "b"]
-
-extern crate a;
-
-fn main() {
-    a::foo(22_u32);
-}