diff --git a/crates/sel4-generate-target-specs/src/main.rs b/crates/sel4-generate-target-specs/src/main.rs
index 5efd2a54f..7b84a46af 100644
--- a/crates/sel4-generate-target-specs/src/main.rs
+++ b/crates/sel4-generate-target-specs/src/main.rs
@@ -28,11 +28,28 @@ struct Config {
 #[derive(Debug, Copy, Clone, PartialEq, Eq)]
 enum Arch {
     AArch64,
-    Riscv64,
-    Riscv32,
+    Riscv64(RiscVArch),
+    Riscv32(RiscVArch),
     X86_64,
 }
 
+#[derive(Debug, Copy, Clone, PartialEq, Eq)]
+enum RiscVArch {
+    IMAC,
+    IMAFC,
+    GC,
+}
+
+impl RiscVArch {
+    fn arch_suffix_for_target_name(&self) -> String {
+        match self {
+            Self::IMAFC => "imafc".to_owned(),
+            Self::IMAC => "imac".to_owned(),
+            Self::GC => "gc".to_owned(),
+        }
+    }
+}
+
 impl Config {
     fn target_spec(&self) -> Target {
         let mut target = match &self.arch {
@@ -56,8 +73,14 @@ impl Config {
                 )]);
                 target
             }
-            Arch::Riscv64 => builtin("riscv64imac-unknown-none-elf"),
-            Arch::Riscv32 => builtin("riscv32imac-unknown-none-elf"),
+            Arch::Riscv64(riscv_arch) => builtin(&format!(
+                "riscv64{}-unknown-none-elf",
+                riscv_arch.arch_suffix_for_target_name()
+            )),
+            Arch::Riscv32(riscv_arch) => builtin(&format!(
+                "riscv32{}-unknown-none-elf",
+                riscv_arch.arch_suffix_for_target_name()
+            )),
             Arch::X86_64 => {
                 let mut target = builtin("x86_64-unknown-none");
                 let options = &mut target.options;
@@ -132,8 +155,12 @@ impl Arch {
     fn name(&self) -> String {
         match self {
             Self::AArch64 => "aarch64".to_owned(),
-            Self::Riscv64 => "riscv64imac".to_owned(),
-            Self::Riscv32 => "riscv32imac".to_owned(),
+            Self::Riscv64(riscv_arch) => {
+                format!("riscv64{}", riscv_arch.arch_suffix_for_target_name())
+            }
+            Self::Riscv32(riscv_arch) => {
+                format!("riscv32{}", riscv_arch.arch_suffix_for_target_name())
+            }
             Self::X86_64 => "x86_64".to_owned(),
         }
     }
@@ -146,7 +173,14 @@ impl Arch {
     }
 
     fn all() -> Vec<Self> {
-        vec![Self::AArch64, Self::Riscv64, Self::Riscv32, Self::X86_64]
+        let mut v = vec![];
+        v.push(Self::AArch64);
+        v.push(Self::Riscv64(RiscVArch::IMAC));
+        v.push(Self::Riscv64(RiscVArch::GC));
+        v.push(Self::Riscv32(RiscVArch::IMAC));
+        // v.push(Self::Riscv32(RiscVArch::IMAFC)); # TODO add after bumping Rust toolchain
+        v.push(Self::X86_64);
+        v
     }
 }
 
diff --git a/support/targets/riscv64gc-sel4-minimal.json b/support/targets/riscv64gc-sel4-minimal.json
new file mode 100644
index 000000000..46c62711b
--- /dev/null
+++ b/support/targets/riscv64gc-sel4-minimal.json
@@ -0,0 +1,22 @@
+{
+  "arch": "riscv64",
+  "code-model": "medium",
+  "cpu": "generic-rv64",
+  "data-layout": "e-m:e-p:64:64-i64:64-i128:128-n32:64-S128",
+  "eh-frame-header": false,
+  "emit-debug-gdb-scripts": false,
+  "env": "sel4",
+  "exe-suffix": ".elf",
+  "features": "+m,+a,+f,+d,+c",
+  "linker": "rust-lld",
+  "linker-flavor": "ld.lld",
+  "llvm-abiname": "lp64d",
+  "llvm-target": "riscv64",
+  "max-atomic-width": 64,
+  "panic-strategy": "abort",
+  "relocation-model": "static",
+  "supported-sanitizers": [
+    "kernel-address"
+  ],
+  "target-pointer-width": "64"
+}
diff --git a/support/targets/riscv64gc-sel4.json b/support/targets/riscv64gc-sel4.json
new file mode 100644
index 000000000..328820b2a
--- /dev/null
+++ b/support/targets/riscv64gc-sel4.json
@@ -0,0 +1,21 @@
+{
+  "arch": "riscv64",
+  "code-model": "medium",
+  "cpu": "generic-rv64",
+  "data-layout": "e-m:e-p:64:64-i64:64-i128:128-n32:64-S128",
+  "emit-debug-gdb-scripts": false,
+  "env": "sel4",
+  "exe-suffix": ".elf",
+  "features": "+m,+a,+f,+d,+c",
+  "has-thread-local": true,
+  "linker": "rust-lld",
+  "linker-flavor": "ld.lld",
+  "llvm-abiname": "lp64d",
+  "llvm-target": "riscv64",
+  "max-atomic-width": 64,
+  "relocation-model": "static",
+  "supported-sanitizers": [
+    "kernel-address"
+  ],
+  "target-pointer-width": "64"
+}