Add e, em, ec (#6)

* rust=1.77.2
* Add backends for e, ec, em
* Refactor Justfile
* test.sh: add backends
* Debug image: install tools earlier

Author: hegza

Containerfile

@@ -72,15 +72,17 @@ RUN apt install -y \
 # Clone the Rust compiler
 WORKDIR /opt/
 RUN \
-  git clone --single-branch https://github.com/rust-lang/rust && \
-  cd rust && \
-  git checkout bf3c6c5bed498f41ad815641319a1ad9bcecb8e8
+  git clone --branch 1.77.2 --depth 1 https://github.com/rust-lang/rust && \
+  cd rust
 
-# Apply patch & configure Rust for build
+# Apply patches & configure Rust for build
 WORKDIR /opt/rust/
-COPY 01_riscv32emc_target.patch .
-RUN git apply 01_riscv32emc_target.patch
 COPY config.toml .
+COPY patches .
+
+RUN git config --global user.name "$(git --no-pager log --format=format:'%an' -n 1)" && \
+  git config --global user.email "$(git --no-pager log --format=format:'%ae' -n 1)" && \
+  git am --committer-date-is-author-date *.patch
 
 # Build the Rust compiler
 RUN ./x build library

Justfile

@@ -1,8 +1,19 @@
+ver := "0.2"
+
 build-debug:
-    podman build -t rust-rv32e:0.2-debug -f Containerfile -f debug.Containerfile --target debug
+    #!/usr/bin/env bash
+    set -euo pipefail
+    tag=rust-rv32e:{{ver}}-debug
+    podman build -t ${tag} -f Containerfile -f debug.Containerfile --target debug
 
 build-minimal:
-    podman build -t rust-rv32e:0.2-minimal -f Containerfile --target minimal
+    #!/usr/bin/env bash
+    set -euo pipefail
+    tag=rust-rv32e:{{ver}}-minimal
+    podman build -t ${tag} -f Containerfile --target minimal
 
 build-devel:
-    podman build -t rust-rv32e:0.2-devel -f Containerfile --target devel
+    #!/usr/bin/env bash
+    set -euo pipefail
+    tag=rust-rv32e:{{ver}}-devel
+    podman build -t ${tag} -f Containerfile --target devel

README.md

@@ -1,6 +1,6 @@
 # Rust for rv32emc-unknown-none-elf (Docker)
 
-A Docker container for a Rust compiler targeting rv32{e,i}mc-unknown-none-elf.
+A Docker container for a Rust compiler targeting rv32emc-unknown-none-elf.
 
 ## Requirements
 

config.toml

@@ -8,13 +8,25 @@ llvm-config = "/opt/llvm/bin/llvm-config"
 [target.riscv32imc-unknown-none-elf]
 llvm-config = "/opt/llvm/bin/llvm-config"
 
+[target.riscv32e-unknown-none-elf]
+llvm-config = "/opt/llvm/bin/llvm-config"
+
+[target.riscv32ec-unknown-none-elf]
+llvm-config = "/opt/llvm/bin/llvm-config"
+
+[target.riscv32em-unknown-none-elf]
+llvm-config = "/opt/llvm/bin/llvm-config"
+
 [target.riscv32emc-unknown-none-elf]
 llvm-config = "/opt/llvm/bin/llvm-config"
 
 [build]
 target = [
     "x86_64-unknown-linux-gnu",
     "riscv32imc-unknown-none-elf",
+    "riscv32e-unknown-none-elf",
+    "riscv32ec-unknown-none-elf",
+    "riscv32em-unknown-none-elf",
     "riscv32emc-unknown-none-elf",
 ]
 # Building docs for no_std targets seems to fail here

debug.Containerfile

@@ -3,6 +3,14 @@
 # This image is much larger than the release image, and is not intended for end-use
 FROM builder AS debug
 
+# Add tools for end-user
+RUN apt install -y \
+    binutils \
+    git \
+    tmux \
+    vim \
+    zsh
+
 WORKDIR /root/
 
 # Add RISC-V to path
@@ -23,11 +31,3 @@ RUN \
 COPY scripts/test_riscv32emc_compile.sh .
 RUN chmod u+x test_riscv32emc_compile.sh && \
   ./test_riscv32emc_compile.sh
-
-# Add tools for end-user
-RUN apt install -y \
-    binutils \
-    git \
-    tmux \
-    vim \
-    zsh

patches/0001-riscv32e.patch

@@ -0,0 +1,57 @@
+From 2a0bd7325e66cf35d488ae51a6e3991b8a00d613 Mon Sep 17 00:00:00 2001
+From: Henri Lunnikivi <[email protected]>
+Date: Mon, 29 Apr 2024 13:01:10 +0300
+Subject: [PATCH 1/4] riscv32e
+
+---
+ compiler/rustc_target/src/spec/mod.rs         |  2 ++
+ .../spec/targets/riscv32e_unknown_none_elf.rs | 24 +++++++++++++++++++
+ 2 files changed, 26 insertions(+)
+ create mode 100644 compiler/rustc_target/src/spec/targets/riscv32e_unknown_none_elf.rs
+
+diff --git a/compiler/rustc_target/src/spec/mod.rs b/compiler/rustc_target/src/spec/mod.rs
+index 6c698c5b..a7bb6d0c 100644
+--- a/compiler/rustc_target/src/spec/mod.rs
++++ b/compiler/rustc_target/src/spec/mod.rs
+@@ -1614,6 +1614,8 @@ fn $module() {
+     ("riscv64gc-unknown-linux-gnu", riscv64gc_unknown_linux_gnu),
+     ("riscv64gc-unknown-linux-musl", riscv64gc_unknown_linux_musl),
+ 
++    ("riscv32e-unknown-none-elf", riscv32e_unknown_none_elf),
++
+     ("sparc-unknown-none-elf", sparc_unknown_none_elf),
+ 
+     ("loongarch64-unknown-none", loongarch64_unknown_none),
+diff --git a/compiler/rustc_target/src/spec/targets/riscv32e_unknown_none_elf.rs b/compiler/rustc_target/src/spec/targets/riscv32e_unknown_none_elf.rs
+new file mode 100644
+index 00000000..60134ff4
+--- /dev/null
++++ b/compiler/rustc_target/src/spec/targets/riscv32e_unknown_none_elf.rs
+@@ -0,0 +1,24 @@
++use crate::spec::{Cc, LinkerFlavor, Lld, PanicStrategy, RelocModel, Target, TargetOptions};
++
++pub fn target() -> Target {
++    Target {
++        data_layout: "e-m:e-p:32:32-i64:64-n32-S128".into(),
++        llvm_target: "riscv32".into(),
++        pointer_width: 32,
++        arch: "riscv32".into(),
++
++        options: TargetOptions {
++            linker_flavor: LinkerFlavor::Gnu(Cc::No, Lld::Yes),
++            linker: Some("rust-lld".into()),
++            cpu: "generic-rv32".into(),
++            max_atomic_width: Some(32),
++            atomic_cas: false,
++            features: "+e,+forced-atomics".into(),
++            panic_strategy: PanicStrategy::Abort,
++            relocation_model: RelocModel::Static,
++            emit_debug_gdb_scripts: false,
++            eh_frame_header: false,
++            ..Default::default()
++        },
++    }
++}
+-- 
+2.37.3.windows.1
+

patches/0002-riscv32ec.patch

@@ -0,0 +1,56 @@
+From 819e15e797dfe15321cab63418e0bbab16156fb3 Mon Sep 17 00:00:00 2001
+From: Henri Lunnikivi <[email protected]>
+Date: Mon, 29 Apr 2024 13:01:26 +0300
+Subject: [PATCH 2/4] riscv32ec
+
+---
+ compiler/rustc_target/src/spec/mod.rs         |  1 +
+ .../targets/riscv32ec_unknown_none_elf.rs     | 24 +++++++++++++++++++
+ 2 files changed, 25 insertions(+)
+ create mode 100644 compiler/rustc_target/src/spec/targets/riscv32ec_unknown_none_elf.rs
+
+diff --git a/compiler/rustc_target/src/spec/mod.rs b/compiler/rustc_target/src/spec/mod.rs
+index a7bb6d0c..06771c11 100644
+--- a/compiler/rustc_target/src/spec/mod.rs
++++ b/compiler/rustc_target/src/spec/mod.rs
+@@ -1615,6 +1615,7 @@ fn $module() {
+     ("riscv64gc-unknown-linux-musl", riscv64gc_unknown_linux_musl),
+ 
+     ("riscv32e-unknown-none-elf", riscv32e_unknown_none_elf),
++    ("riscv32ec-unknown-none-elf", riscv32ec_unknown_none_elf),
+ 
+     ("sparc-unknown-none-elf", sparc_unknown_none_elf),
+ 
+diff --git a/compiler/rustc_target/src/spec/targets/riscv32ec_unknown_none_elf.rs b/compiler/rustc_target/src/spec/targets/riscv32ec_unknown_none_elf.rs
+new file mode 100644
+index 00000000..19d29585
+--- /dev/null
++++ b/compiler/rustc_target/src/spec/targets/riscv32ec_unknown_none_elf.rs
+@@ -0,0 +1,24 @@
++use crate::spec::{Cc, LinkerFlavor, Lld, PanicStrategy, RelocModel, Target, TargetOptions};
++
++pub fn target() -> Target {
++    Target {
++        data_layout: "e-m:e-p:32:32-i64:64-n32-S128".into(),
++        llvm_target: "riscv32".into(),
++        pointer_width: 32,
++        arch: "riscv32".into(),
++
++        options: TargetOptions {
++            linker_flavor: LinkerFlavor::Gnu(Cc::No, Lld::Yes),
++            linker: Some("rust-lld".into()),
++            cpu: "generic-rv32".into(),
++            max_atomic_width: Some(32),
++            atomic_cas: false,
++            features: "+e,+c,+forced-atomics".into(),
++            panic_strategy: PanicStrategy::Abort,
++            relocation_model: RelocModel::Static,
++            emit_debug_gdb_scripts: false,
++            eh_frame_header: false,
++            ..Default::default()
++        },
++    }
++}
+-- 
+2.37.3.windows.1
+

patches/0003-riscv32em.patch

@@ -0,0 +1,56 @@
+From 871677560f8925a5c4cf4643446ee14929b12538 Mon Sep 17 00:00:00 2001
+From: Henri Lunnikivi <[email protected]>
+Date: Mon, 29 Apr 2024 13:01:47 +0300
+Subject: [PATCH 3/4] riscv32em
+
+---
+ compiler/rustc_target/src/spec/mod.rs         |  1 +
+ .../targets/riscv32em_unknown_none_elf.rs     | 24 +++++++++++++++++++
+ 2 files changed, 25 insertions(+)
+ create mode 100644 compiler/rustc_target/src/spec/targets/riscv32em_unknown_none_elf.rs
+
+diff --git a/compiler/rustc_target/src/spec/mod.rs b/compiler/rustc_target/src/spec/mod.rs
+index 06771c11..f00525f2 100644
+--- a/compiler/rustc_target/src/spec/mod.rs
++++ b/compiler/rustc_target/src/spec/mod.rs
+@@ -1616,6 +1616,7 @@ fn $module() {
+ 
+     ("riscv32e-unknown-none-elf", riscv32e_unknown_none_elf),
+     ("riscv32ec-unknown-none-elf", riscv32ec_unknown_none_elf),
++    ("riscv32em-unknown-none-elf", riscv32em_unknown_none_elf),
+ 
+     ("sparc-unknown-none-elf", sparc_unknown_none_elf),
+ 
+diff --git a/compiler/rustc_target/src/spec/targets/riscv32em_unknown_none_elf.rs b/compiler/rustc_target/src/spec/targets/riscv32em_unknown_none_elf.rs
+new file mode 100644
+index 00000000..b2ca27dd
+--- /dev/null
++++ b/compiler/rustc_target/src/spec/targets/riscv32em_unknown_none_elf.rs
+@@ -0,0 +1,24 @@
++use crate::spec::{Cc, LinkerFlavor, Lld, PanicStrategy, RelocModel, Target, TargetOptions};
++
++pub fn target() -> Target {
++    Target {
++        data_layout: "e-m:e-p:32:32-i64:64-n32-S128".into(),
++        llvm_target: "riscv32".into(),
++        pointer_width: 32,
++        arch: "riscv32".into(),
++
++        options: TargetOptions {
++            linker_flavor: LinkerFlavor::Gnu(Cc::No, Lld::Yes),
++            linker: Some("rust-lld".into()),
++            cpu: "generic-rv32".into(),
++            max_atomic_width: Some(32),
++            atomic_cas: false,
++            features: "+e,+m,+forced-atomics".into(),
++            panic_strategy: PanicStrategy::Abort,
++            relocation_model: RelocModel::Static,
++            emit_debug_gdb_scripts: false,
++            eh_frame_header: false,
++            ..Default::default()
++        },
++    }
++}
+-- 
+2.37.3.windows.1
+

01_riscv32emc_target.patch patches/0004-riscv32emc.patch

@@ -1,18 +1,29 @@
+From f86a580effd97a8e66e35438f1e8637bb99a74de Mon Sep 17 00:00:00 2001
+From: Henri Lunnikivi <[email protected]>
+Date: Mon, 29 Apr 2024 13:01:55 +0300
+Subject: [PATCH 4/4] riscv32emc
+
+---
+ compiler/rustc_target/src/spec/mod.rs         |  1 +
+ .../targets/riscv32emc_unknown_none_elf.rs    | 24 +++++++++++++++++++
+ 2 files changed, 25 insertions(+)
+ create mode 100644 compiler/rustc_target/src/spec/targets/riscv32emc_unknown_none_elf.rs
+
 diff --git a/compiler/rustc_target/src/spec/mod.rs b/compiler/rustc_target/src/spec/mod.rs
-index 6c698c5b01d..ca66bcc6873 100644
+index f00525f2..e4de621c 100644
 --- a/compiler/rustc_target/src/spec/mod.rs
 +++ b/compiler/rustc_target/src/spec/mod.rs
-@@ -1600,6 +1600,7 @@ fn $module() {
-     ("riscv32im-risc0-zkvm-elf", riscv32im_risc0_zkvm_elf),
-     ("riscv32im-unknown-none-elf", riscv32im_unknown_none_elf),
-     ("riscv32imc-unknown-none-elf", riscv32imc_unknown_none_elf),
+@@ -1617,6 +1617,7 @@ fn $module() {
+     ("riscv32e-unknown-none-elf", riscv32e_unknown_none_elf),
+     ("riscv32ec-unknown-none-elf", riscv32ec_unknown_none_elf),
+     ("riscv32em-unknown-none-elf", riscv32em_unknown_none_elf),
 +    ("riscv32emc-unknown-none-elf", riscv32emc_unknown_none_elf),
-     ("riscv32imc-esp-espidf", riscv32imc_esp_espidf),
-     ("riscv32imac-esp-espidf", riscv32imac_esp_espidf),
-     ("riscv32imafc-esp-espidf", riscv32imafc_esp_espidf),
+ 
+     ("sparc-unknown-none-elf", sparc_unknown_none_elf),
+ 
 diff --git a/compiler/rustc_target/src/spec/targets/riscv32emc_unknown_none_elf.rs b/compiler/rustc_target/src/spec/targets/riscv32emc_unknown_none_elf.rs
 new file mode 100644
-index 00000000000..7ce0361a148
+index 00000000..b469a663
 --- /dev/null
 +++ b/compiler/rustc_target/src/spec/targets/riscv32emc_unknown_none_elf.rs
 @@ -0,0 +1,24 @@
@@ -31,7 +42,7 @@ index 00000000000..7ce0361a148
 +            cpu: "generic-rv32".into(),
 +            max_atomic_width: Some(32),
 +            atomic_cas: false,
-+            features: "+m,+c,+e,+forced-atomics".into(),
++            features: "+e,+m,+c,+forced-atomics".into(),
 +            panic_strategy: PanicStrategy::Abort,
 +            relocation_model: RelocModel::Static,
 +            emit_debug_gdb_scripts: false,
@@ -40,3 +51,6 @@ index 00000000000..7ce0361a148
 +        },
 +    }
 +}
+-- 
+2.37.3.windows.1
+

scripts/test_riscv32emc_compile.sh

@@ -1,8 +1,13 @@
 #!/bin/bash
+set -euxo pipefail
 
-# Run compiler on container to test that it works
+# Run compilers on container to test that they work
 
 git clone --depth=1 --branch=feat/rve https://github.com/hegza/riscv
 cd riscv/riscv-rt
 
-RUSTFLAGS="-C linker=riscv32-unknown-elf-gcc -C link-arg=-nostartfiles -C link-arg=-Triscv-rt/examples/device.x" cargo build --target riscv32emc-unknown-none-elf --examples
+export RUSTFLAGS="-C linker=riscv32-unknown-elf-gcc -C link-arg=-nostartfiles -C link-arg=-Triscv-rt/examples/device.x"
+cargo build --target riscv32e-unknown-none-elf --examples
+cargo build --target riscv32em-unknown-none-elf --examples
+cargo build --target riscv32ec-unknown-none-elf --examples
+cargo build --target riscv32emc-unknown-none-elf --examples