Merging upstream version 1.70.0+dfsg1.

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

8 files changed, 0 insertions, 82 deletions

diff --git a/tests/run-make-fulldeps/target-specs/Makefile b/tests/run-make-fulldeps/target-specs/Makefile
deleted file mode 100644
index a33f5368e..000000000
--- a/tests/run-make-fulldeps/target-specs/Makefile
+++ /dev/null
@@ -1,11 +0,0 @@
-include ../tools.mk
-all:
-	$(RUSTC) foo.rs --target=my-awesome-platform.json --crate-type=lib --emit=asm
-	$(CGREP) -v morestack < $(TMPDIR)/foo.s
-	$(RUSTC) foo.rs --target=my-invalid-platform.json 2>&1 | $(CGREP) "Error loading target specification"
-	$(RUSTC) foo.rs --target=my-incomplete-platform.json 2>&1 | $(CGREP) 'Field llvm-target'
-	RUST_TARGET_PATH=. $(RUSTC) foo.rs --target=my-awesome-platform --crate-type=lib --emit=asm
-	RUST_TARGET_PATH=. $(RUSTC) foo.rs --target=my-x86_64-unknown-linux-gnu-platform --crate-type=lib --emit=asm
-	$(RUSTC) -Z unstable-options --target=my-awesome-platform.json --print target-spec-json > $(TMPDIR)/test-platform.json && $(RUSTC) -Z unstable-options --target=$(TMPDIR)/test-platform.json --print target-spec-json | diff -q $(TMPDIR)/test-platform.json -
-	$(RUSTC) foo.rs --target=definitely-not-builtin-target 2>&1 | $(CGREP) 'may not set is_builtin'
-	$(RUSTC) foo.rs --target=mismatching-data-layout --crate-type=lib
diff --git a/tests/run-make-fulldeps/target-specs/definitely-not-builtin-target.json b/tests/run-make-fulldeps/target-specs/definitely-not-builtin-target.json
deleted file mode 100644
index b36fa993d..000000000
--- a/tests/run-make-fulldeps/target-specs/definitely-not-builtin-target.json
+++ /dev/null
@@ -1,7 +0,0 @@
-{
-  "arch": "x86_64",
-  "is-builtin": true,
-  "data-layout": "e-m:e-i64:64-f80:128-n8:16:32:64-S128",
-  "llvm-target": "x86_64-unknown-unknown-gnu",
-  "target-pointer-width": "64"
-}
diff --git a/tests/run-make-fulldeps/target-specs/foo.rs b/tests/run-make-fulldeps/target-specs/foo.rs
deleted file mode 100644
index 22939e879..000000000
--- a/tests/run-make-fulldeps/target-specs/foo.rs
+++ /dev/null
@@ -1,24 +0,0 @@
-#![feature(lang_items, no_core, auto_traits)]
-#![no_core]
-
-#[lang = "copy"]
-trait Copy {}
-
-#[lang = "sized"]
-trait Sized {}
-
-#[lang = "freeze"]
-auto trait Freeze {}
-
-#[lang = "start"]
-fn start<T>(_main: fn() -> T, _argc: isize, _argv: *const *const u8, _sigpipe: u8) -> isize {
-    0
-}
-
-extern "C" {
-    fn _foo() -> [u8; 16];
-}
-
-fn _main() {
-    let _a = unsafe { _foo() };
-}
diff --git a/tests/run-make-fulldeps/target-specs/mismatching-data-layout.json b/tests/run-make-fulldeps/target-specs/mismatching-data-layout.json
deleted file mode 100644
index d12caaad1..000000000
--- a/tests/run-make-fulldeps/target-specs/mismatching-data-layout.json
+++ /dev/null
@@ -1,6 +0,0 @@
-{
-  "arch": "x86_64",
-  "data-layout": "e-m:e-i64:16:32:64",
-  "llvm-target": "x86_64-unknown-unknown-gnu",
-  "target-pointer-width": "64"
-}
diff --git a/tests/run-make-fulldeps/target-specs/my-awesome-platform.json b/tests/run-make-fulldeps/target-specs/my-awesome-platform.json
deleted file mode 100644
index 00de3de05..000000000
--- a/tests/run-make-fulldeps/target-specs/my-awesome-platform.json
+++ /dev/null
@@ -1,11 +0,0 @@
-{
-    "data-layout": "e-m:e-p:32:32-p270:32:32-p271:32:32-p272:64:64-f64:32:64-f80:32-n8:16:32-S128",
-    "linker-flavor": "gcc",
-    "llvm-target": "i686-unknown-linux-gnu",
-    "target-endian": "little",
-    "target-pointer-width": "32",
-    "target-c-int-width": "32",
-    "arch": "x86",
-    "os": "linux",
-    "morestack": false
-}
diff --git a/tests/run-make-fulldeps/target-specs/my-incomplete-platform.json b/tests/run-make-fulldeps/target-specs/my-incomplete-platform.json
deleted file mode 100644
index ceaa25cdf..000000000
--- a/tests/run-make-fulldeps/target-specs/my-incomplete-platform.json
+++ /dev/null
@@ -1,10 +0,0 @@
-{
-    "data-layout": "e-p:32:32-f64:32:64-i64:32:64-f80:32:32-n8:16:32",
-    "linker-flavor": "gcc",
-    "target-endian": "little",
-    "target-pointer-width": "32",
-    "target-c-int-width": "32",
-    "arch": "x86",
-    "os": "foo",
-    "morestack": false
-}
diff --git a/tests/run-make-fulldeps/target-specs/my-invalid-platform.json b/tests/run-make-fulldeps/target-specs/my-invalid-platform.json
deleted file mode 100644
index 3feac45b7..000000000
--- a/tests/run-make-fulldeps/target-specs/my-invalid-platform.json
+++ /dev/null
@@ -1 +0,0 @@
-wow this json is really broke!
diff --git a/tests/run-make-fulldeps/target-specs/my-x86_64-unknown-linux-gnu-platform.json b/tests/run-make-fulldeps/target-specs/my-x86_64-unknown-linux-gnu-platform.json
deleted file mode 100644
index 6d5e964ed..000000000
--- a/tests/run-make-fulldeps/target-specs/my-x86_64-unknown-linux-gnu-platform.json
+++ /dev/null
@@ -1,12 +0,0 @@
-{
-    "pre-link-args": {"gcc": ["-m64"]},
-    "data-layout": "e-m:e-p270:32:32-p271:32:32-p272:64:64-i64:64-f80:128-n8:16:32:64-S128",
-    "linker-flavor": "gcc",
-    "llvm-target": "x86_64-unknown-linux-gnu",
-    "target-endian": "little",
-    "target-pointer-width": "64",
-    "target-c-int-width": "32",
-    "arch": "x86_64",
-    "os": "linux",
-    "morestack": false
-}