Merging upstream version 1.72.1+dfsg1.

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

1 files changed, 0 insertions, 193 deletions

diff --git a/compiler/rustc_codegen_cranelift/build_system/mod.rs b/compiler/rustc_codegen_cranelift/build_system/mod.rs
deleted file mode 100644
index e4ed9be23..000000000
--- a/compiler/rustc_codegen_cranelift/build_system/mod.rs
+++ /dev/null
@@ -1,193 +0,0 @@
-use std::env;
-use std::path::PathBuf;
-use std::process;
-
-use self::utils::{is_ci, is_ci_opt, Compiler};
-
-mod abi_cafe;
-mod bench;
-mod build_backend;
-mod build_sysroot;
-mod config;
-mod path;
-mod prepare;
-mod rustc_info;
-mod tests;
-mod utils;
-
-fn usage() {
-    eprintln!("{}", include_str!("usage.txt"));
-}
-
-macro_rules! arg_error {
-    ($($err:tt)*) => {{
-        eprintln!($($err)*);
-        usage();
-        std::process::exit(1);
-    }};
-}
-
-#[derive(PartialEq, Debug)]
-enum Command {
-    Prepare,
-    Build,
-    Test,
-    AbiCafe,
-    Bench,
-}
-
-#[derive(Copy, Clone, Debug)]
-pub(crate) enum SysrootKind {
-    None,
-    Clif,
-    Llvm,
-}
-
-pub(crate) fn main() {
-    if env::var("RUST_BACKTRACE").is_err() {
-        env::set_var("RUST_BACKTRACE", "1");
-    }
-    env::set_var("CG_CLIF_DISABLE_INCR_CACHE", "1");
-
-    if is_ci() {
-        // Disabling incr comp reduces cache size and incr comp doesn't save as much on CI anyway
-        env::set_var("CARGO_BUILD_INCREMENTAL", "false");
-
-        if !is_ci_opt() {
-            // Enable the Cranelift verifier
-            env::set_var("CG_CLIF_ENABLE_VERIFIER", "1");
-        }
-    }
-
-    let mut args = env::args().skip(1);
-    let command = match args.next().as_deref() {
-        Some("prepare") => Command::Prepare,
-        Some("build") => Command::Build,
-        Some("test") => Command::Test,
-        Some("abi-cafe") => Command::AbiCafe,
-        Some("bench") => Command::Bench,
-        Some(flag) if flag.starts_with('-') => arg_error!("Expected command found flag {}", flag),
-        Some(command) => arg_error!("Unknown command {}", command),
-        None => {
-            usage();
-            process::exit(0);
-        }
-    };
-
-    let mut out_dir = PathBuf::from(".");
-    let mut channel = "release";
-    let mut sysroot_kind = SysrootKind::Clif;
-    let mut use_unstable_features = true;
-    while let Some(arg) = args.next().as_deref() {
-        match arg {
-            "--out-dir" => {
-                out_dir = PathBuf::from(args.next().unwrap_or_else(|| {
-                    arg_error!("--out-dir requires argument");
-                }))
-            }
-            "--debug" => channel = "debug",
-            "--sysroot" => {
-                sysroot_kind = match args.next().as_deref() {
-                    Some("none") => SysrootKind::None,
-                    Some("clif") => SysrootKind::Clif,
-                    Some("llvm") => SysrootKind::Llvm,
-                    Some(arg) => arg_error!("Unknown sysroot kind {}", arg),
-                    None => arg_error!("--sysroot requires argument"),
-                }
-            }
-            "--no-unstable-features" => use_unstable_features = false,
-            flag if flag.starts_with("-") => arg_error!("Unknown flag {}", flag),
-            arg => arg_error!("Unexpected argument {}", arg),
-        }
-    }
-
-    let bootstrap_host_compiler = Compiler::bootstrap_with_triple(
-        std::env::var("HOST_TRIPLE")
-            .ok()
-            .or_else(|| config::get_value("host"))
-            .unwrap_or_else(|| rustc_info::get_host_triple()),
-    );
-    let target_triple = std::env::var("TARGET_TRIPLE")
-        .ok()
-        .or_else(|| config::get_value("target"))
-        .unwrap_or_else(|| bootstrap_host_compiler.triple.clone());
-
-    // FIXME allow changing the location of these dirs using cli arguments
-    let current_dir = std::env::current_dir().unwrap();
-    out_dir = current_dir.join(out_dir);
-    let dirs = path::Dirs {
-        source_dir: current_dir.clone(),
-        download_dir: out_dir.join("download"),
-        build_dir: out_dir.join("build"),
-        dist_dir: out_dir.join("dist"),
-    };
-
-    path::RelPath::BUILD.ensure_exists(&dirs);
-
-    {
-        // Make sure we always explicitly specify the target dir
-        let target =
-            path::RelPath::BUILD.join("target_dir_should_be_set_explicitly").to_path(&dirs);
-        env::set_var("CARGO_TARGET_DIR", &target);
-        let _ = std::fs::remove_file(&target);
-        std::fs::File::create(target).unwrap();
-    }
-
-    if command == Command::Prepare {
-        prepare::prepare(&dirs);
-        process::exit(0);
-    }
-
-    env::set_var("RUSTC", "rustc_should_be_set_explicitly");
-    env::set_var("RUSTDOC", "rustdoc_should_be_set_explicitly");
-
-    let cg_clif_dylib = build_backend::build_backend(
-        &dirs,
-        channel,
-        &bootstrap_host_compiler,
-        use_unstable_features,
-    );
-    match command {
-        Command::Prepare => {
-            // Handled above
-        }
-        Command::Test => {
-            tests::run_tests(
-                &dirs,
-                channel,
-                sysroot_kind,
-                &cg_clif_dylib,
-                &bootstrap_host_compiler,
-                target_triple.clone(),
-            );
-        }
-        Command::AbiCafe => {
-            if bootstrap_host_compiler.triple != target_triple {
-                eprintln!("Abi-cafe doesn't support cross-compilation");
-                process::exit(1);
-            }
-            abi_cafe::run(channel, sysroot_kind, &dirs, &cg_clif_dylib, &bootstrap_host_compiler);
-        }
-        Command::Build => {
-            build_sysroot::build_sysroot(
-                &dirs,
-                channel,
-                sysroot_kind,
-                &cg_clif_dylib,
-                &bootstrap_host_compiler,
-                target_triple,
-            );
-        }
-        Command::Bench => {
-            build_sysroot::build_sysroot(
-                &dirs,
-                channel,
-                sysroot_kind,
-                &cg_clif_dylib,
-                &bootstrap_host_compiler,
-                target_triple,
-            );
-            bench::benchmark(&dirs, &bootstrap_host_compiler);
-        }
-    }
-}