Merging upstream version 1.70.0+dfsg1.

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

3 files changed, 0 insertions, 52 deletions

diff --git a/tests/run-make-fulldeps/longjmp-across-rust/Makefile b/tests/run-make-fulldeps/longjmp-across-rust/Makefile
deleted file mode 100644
index 848638d82..000000000
--- a/tests/run-make-fulldeps/longjmp-across-rust/Makefile
+++ /dev/null
@@ -1,5 +0,0 @@
-include ../tools.mk
-
-all: $(call NATIVE_STATICLIB,foo)
-	$(RUSTC) main.rs
-	$(call RUN,main)
diff --git a/tests/run-make-fulldeps/longjmp-across-rust/foo.c b/tests/run-make-fulldeps/longjmp-across-rust/foo.c
deleted file mode 100644
index bd71cc4d7..000000000
--- a/tests/run-make-fulldeps/longjmp-across-rust/foo.c
+++ /dev/null
@@ -1,18 +0,0 @@
-#include <assert.h>
-#include <setjmp.h>
-
-static jmp_buf ENV;
-
-extern void test_middle();
-
-void test_start(void(*f)()) {
-  if (setjmp(ENV) != 0)
-    return;
-  f();
-  assert(0);
-}
-
-void test_end() {
-  longjmp(ENV, 1);
-  assert(0);
-}
diff --git a/tests/run-make-fulldeps/longjmp-across-rust/main.rs b/tests/run-make-fulldeps/longjmp-across-rust/main.rs
deleted file mode 100644
index cc1d5b126..000000000
--- a/tests/run-make-fulldeps/longjmp-across-rust/main.rs
+++ /dev/null
@@ -1,29 +0,0 @@
-#[link(name = "foo", kind = "static")]
-extern "C" {
-    fn test_start(f: extern "C" fn());
-    fn test_end();
-}
-
-fn main() {
-    unsafe {
-        test_start(test_middle);
-    }
-}
-
-struct A;
-
-impl Drop for A {
-    fn drop(&mut self) {}
-}
-
-extern "C" fn test_middle() {
-    let _a = A;
-    foo();
-}
-
-fn foo() {
-    let _a = A;
-    unsafe {
-        test_end();
-    }
-}