From 1376c5a617be5c25655d0d7cb63e3beaa5a6e026 Mon Sep 17 00:00:00 2001
From: Daniel Baumann <daniel.baumann@progress-linux.org>
Date: Wed, 17 Apr 2024 14:20:39 +0200
Subject: Merging upstream version 1.70.0+dfsg1.

Signed-off-by: Daniel Baumann <daniel.baumann@progress-linux.org>
---
 tests/run-make-fulldeps/intrinsic-unreachable/Makefile | 12 ------------
 .../intrinsic-unreachable/exit-ret.rs                  | 14 --------------
 .../intrinsic-unreachable/exit-unreachable.rs          | 18 ------------------
 3 files changed, 44 deletions(-)
 delete mode 100644 tests/run-make-fulldeps/intrinsic-unreachable/Makefile
 delete mode 100644 tests/run-make-fulldeps/intrinsic-unreachable/exit-ret.rs
 delete mode 100644 tests/run-make-fulldeps/intrinsic-unreachable/exit-unreachable.rs

(limited to 'tests/run-make-fulldeps/intrinsic-unreachable')

diff --git a/tests/run-make-fulldeps/intrinsic-unreachable/Makefile b/tests/run-make-fulldeps/intrinsic-unreachable/Makefile
deleted file mode 100644
index ff9cc5709..000000000
--- a/tests/run-make-fulldeps/intrinsic-unreachable/Makefile
+++ /dev/null
@@ -1,12 +0,0 @@
-include ../tools.mk
-
-# needs-asm-support
-# ignore-windows-msvc
-#
-# Because of Windows exception handling, the code is not necessarily any shorter.
-# https://github.com/llvm-mirror/llvm/commit/64b2297786f7fd6f5fa24cdd4db0298fbf211466
-
-all:
-	$(RUSTC) -O --emit asm exit-ret.rs
-	$(RUSTC) -O --emit asm exit-unreachable.rs
-	test `wc -l < $(TMPDIR)/exit-unreachable.s` -lt `wc -l < $(TMPDIR)/exit-ret.s`
diff --git a/tests/run-make-fulldeps/intrinsic-unreachable/exit-ret.rs b/tests/run-make-fulldeps/intrinsic-unreachable/exit-ret.rs
deleted file mode 100644
index e7b9694d9..000000000
--- a/tests/run-make-fulldeps/intrinsic-unreachable/exit-ret.rs
+++ /dev/null
@@ -1,14 +0,0 @@
-#![crate_type="lib"]
-use std::arch::asm;
-
-#[deny(unreachable_code)]
-pub fn exit(n: usize) -> i32 {
-    unsafe {
-        // Pretend this asm is an exit() syscall.
-        asm!("/*{0}*/", in(reg) n);
-    }
-    // This return value is just here to generate some extra code for a return
-    // value, making it easier for the test script to detect whether the
-    // compiler deleted it.
-    42
-}
diff --git a/tests/run-make-fulldeps/intrinsic-unreachable/exit-unreachable.rs b/tests/run-make-fulldeps/intrinsic-unreachable/exit-unreachable.rs
deleted file mode 100644
index ec85db733..000000000
--- a/tests/run-make-fulldeps/intrinsic-unreachable/exit-unreachable.rs
+++ /dev/null
@@ -1,18 +0,0 @@
-#![feature(core_intrinsics)]
-#![crate_type="lib"]
-use std::arch::asm;
-
-use std::intrinsics;
-
-#[allow(unreachable_code)]
-pub fn exit(n: usize) -> i32 {
-    unsafe {
-        // Pretend this asm is an exit() syscall.
-        asm!("/*{0}*/", in(reg) n);
-        intrinsics::unreachable()
-    }
-    // This return value is just here to generate some extra code for a return
-    // value, making it easier for the test script to detect whether the
-    // compiler deleted it.
-    42
-}
-- 
cgit v1.2.3