feat(xtask): Add support for aarch64_be

Signed-off-by: Jens Reidel <[email protected]>

Author: Gelbpunkt

xtask/src/arch.rs

@@ -11,6 +11,8 @@ pub enum Arch {
 	X86_64,
 	/// AArch64
 	Aarch64,
+	/// AArch64, big-endian
+	Aarch64Be,
 	/// 64-bit RISC-V
 	Riscv64,
 }
@@ -21,6 +23,10 @@ impl Arch {
 	}
 
 	pub fn install(&self) -> Result<()> {
+		if self.tier() > 2 {
+			return Ok(());
+		}
+
 		let mut rustup = crate::rustup();
 		rustup.args(["target", "add", self.triple()]);
 
@@ -42,14 +48,23 @@ impl Arch {
 		match self {
 			Self::X86_64 => "x86_64",
 			Self::Aarch64 => "aarch64",
+			Self::Aarch64Be => "aarch64_be",
 			Self::Riscv64 => "riscv64",
 		}
 	}
 
+	pub fn tier(&self) -> u8 {
+		match self {
+			Self::Aarch64Be => 3,
+			_ => 2,
+		}
+	}
+
 	pub fn triple(&self) -> &'static str {
 		match self {
 			Self::X86_64 => "x86_64-unknown-none",
 			Self::Aarch64 => "aarch64-unknown-none-softfloat",
+			Self::Aarch64Be => "aarch64_be-unknown-none-softfloat",
 			Self::Riscv64 => "riscv64gc-unknown-none-elf",
 		}
 	}
@@ -58,6 +73,7 @@ impl Arch {
 		match self {
 			Self::X86_64 => "x86_64-unknown-hermit",
 			Self::Aarch64 => "aarch64-unknown-hermit",
+			Self::Aarch64Be => "aarch64_be-unknown-hermit",
 			Self::Riscv64 => "riscv64gc-unknown-hermit",
 		}
 	}
@@ -74,6 +90,11 @@ impl Arch {
 				"-Zbuild-std=core",
 				"-Zbuild-std-features=compiler-builtins-mem",
 			],
+			Self::Aarch64Be => &[
+				"--target=aarch64_be-unknown-hermit",
+				"-Zbuild-std=core",
+				"-Zbuild-std-features=compiler-builtins-mem",
+			],
 			Arch::Riscv64 => &[
 				"--target=riscv64gc-unknown-hermit",
 				"-Zbuild-std=core",
@@ -92,6 +113,13 @@ impl Arch {
 				"-Zbuild-std=core,alloc",
 				"-Zbuild-std-features=compiler-builtins-mem",
 			],
+			Self::Aarch64Be => &[
+				"--target=aarch64_be-unknown-none-softfloat",
+				// We can't use prebuilt std here because it is built with
+				// relocation-model=static and we need relocation-model=pic
+				"-Zbuild-std=core,alloc",
+				"-Zbuild-std-features=compiler-builtins-mem",
+			],
 			Self::Riscv64 => &[
 				"--target=riscv64gc-unknown-none-elf",
 				// We can't use prebuilt std here because it is built with
@@ -112,6 +140,10 @@ impl Arch {
 				"--target=aarch64-unknown-hermit",
 				"-Zbuild-std=std,panic_abort",
 			],
+			Self::Aarch64Be => &[
+				"--target=aarch64_be-unknown-hermit",
+				"-Zbuild-std=std,panic_abort",
+			],
 			Arch::Riscv64 => &[
 				"--target=riscv64gc-unknown-hermit",
 				"-Zbuild-std=std,panic_abort",
@@ -122,10 +154,18 @@ impl Arch {
 	pub fn rustflags(&self) -> &'static [&'static str] {
 		match self {
 			Self::X86_64 => &[],
-			Self::Aarch64 => &["-Crelocation-model=pic"],
+			Self::Aarch64 | Self::Aarch64Be => &["-Crelocation-model=pic"],
 			Self::Riscv64 => &["-Cno-redzone", "-Crelocation-model=pic"],
 		}
 	}
+
+	pub fn qemu(&self) -> &'static str {
+		match self {
+			Self::X86_64 => "x86_64",
+			Self::Aarch64 | Self::Aarch64Be => "aarch64",
+			Self::Riscv64 => "riscv64",
+		}
+	}
 }
 
 impl fmt::Display for Arch {

xtask/src/ci/qemu.rs

@@ -88,7 +88,7 @@ impl Qemu {
 			sh.create_dir("shared/tracedir")?;
 		}
 
-		let qemu = env::var("QEMU").unwrap_or_else(|_| format!("qemu-system-{arch}"));
+		let qemu = env::var("QEMU").unwrap_or_else(|_| format!("qemu-system-{}", arch.qemu()));
 		let program = if self.sudo { "sudo" } else { qemu.as_str() };
 		let arg = self.sudo.then_some(qemu.as_str());
 		let memory = self.memory(image_name, arch, small);
@@ -208,7 +208,7 @@ impl Qemu {
 					image_args.push("-initrd".to_string());
 					image_args.push(image.to_str().unwrap().to_string());
 				}
-				Arch::Aarch64 => {
+				Arch::Aarch64 | Arch::Aarch64Be => {
 					image_args.push("-device".to_string());
 					image_args.push(format!(
 						"guest-loader,addr=0x48000000,initrd={}",
@@ -233,7 +233,7 @@ impl Qemu {
 				"-nodefaults".to_string(),
 				"-no-user-config".to_string(),
 			]
-		} else if arch == Arch::Aarch64 {
+		} else if arch == Arch::Aarch64 || arch == Arch::Aarch64Be {
 			vec!["-machine".to_string(), "virt,gic-version=3".to_string()]
 		} else if arch == Arch::Riscv64 {
 			// CadenceGem requires sifive_u
@@ -273,7 +273,7 @@ impl Qemu {
 				cpu_args.push("isa-debug-exit,iobase=0xf4,iosize=0x04".to_string());
 				cpu_args
 			}
-			Arch::Aarch64 => {
+			Arch::Aarch64 | Arch::Aarch64Be => {
 				let mut cpu_args = if self.accel {
 					todo!()
 				} else {
@@ -306,7 +306,7 @@ impl Qemu {
 						32
 					}
 				}
-				Arch::Aarch64 => 144,
+				Arch::Aarch64 | Arch::Aarch64Be => 144,
 				Arch::Riscv64 => 40,
 			};
 		}

xtask/src/clippy.rs

@@ -38,7 +38,7 @@ impl Clippy {
 				Arch::X86_64 => {
 					clippy().arg("--features=shell").run()?;
 				}
-				Arch::Aarch64 => {}
+				Arch::Aarch64 | Arch::Aarch64Be => {}
 				Arch::Riscv64 => {
 					clippy()
 						.arg("--no-default-features")