Merge pull request #3028 from cfallin/x86-legacy

cranelift-codegen: move old x86 and RISC-V backends to isa/legacy/.

cranelift/codegen/src/isa/legacy/mod.rs

@@ -0,0 +1,12 @@
+//! Legacy ("old-style") backends that will be removed in the future.
+
+// N.B.: the old x86-64 backend (`x86`) and the new one (`x64`) are both
+// included whenever building with x86 support. The new backend is the default,
+// but the old can be requested with `BackendVariant::Legacy`. However, if this
+// crate is built with the `old-x86-backend` feature, then the old backend is
+// default instead.
+#[cfg(feature = "x86")]
+pub(crate) mod x86;
+
+#[cfg(feature = "riscv")]
+pub(crate) mod riscv;

cranelift/codegen/src/isa/legacy/x86/abi.rs

@@ -1,6 +1,6 @@
 //! x86 ABI implementation.
 
-use super::super::settings as shared_settings;
+use super::super::super::settings as shared_settings;
 use super::registers::{FPR, GPR, RU};
 use super::settings as isa_settings;
 use crate::abi::{legalize_args, ArgAction, ArgAssigner, ValueConversion};

cranelift/codegen/src/isa/legacy/x86/mod.rs

@@ -178,7 +178,7 @@ impl TargetIsa for Isa {
     fn create_unwind_info(
         &self,
         func: &ir::Function,
-    ) -> CodegenResult<Option<super::unwind::UnwindInfo>> {
+    ) -> CodegenResult<Option<super::super::unwind::UnwindInfo>> {
         abi::create_unwind_info(func, self)
     }
 

cranelift/codegen/src/isa/mod.rs

@@ -70,17 +70,6 @@ use core::fmt::{Debug, Formatter};
 use core::hash::Hasher;
 use target_lexicon::{triple, Architecture, OperatingSystem, PointerWidth, Triple};
 
-#[cfg(feature = "riscv")]
-mod riscv;
-
-// N.B.: the old x86-64 backend (`x86`) and the new one (`x64`) are both
-// included whenever building with x86 support. The new backend is the default,
-// but the old can be requested with `BackendVariant::Legacy`. However, if this
-// crate is built with the `old-x86-backend` feature, then the old backend is
-// default instead.
-#[cfg(feature = "x86")]
-mod x86;
-
 // This module is made public here for benchmarking purposes. No guarantees are
 // made regarding API stability.
 #[cfg(feature = "x86")]
@@ -95,6 +84,15 @@ pub(crate) mod aarch64;
 #[cfg(feature = "s390x")]
 mod s390x;
 
+#[cfg(any(feature = "x86", feature = "riscv"))]
+mod legacy;
+
+#[cfg(feature = "x86")]
+use legacy::x86;
+
+#[cfg(feature = "riscv")]
+use legacy::riscv;
+
 pub mod unwind;
 
 mod call_conv;