Merge "cheriot: remove (incorrect) architecture specification"
diff --git a/platforms/cheri/riscv32/devices.bzl b/platforms/cheri/riscv32/devices.bzl
index 31a928f..4d08f56 100644
--- a/platforms/cheri/riscv32/devices.bzl
+++ b/platforms/cheri/riscv32/devices.bzl
@@ -11,7 +11,6 @@
"//constraints/extension:cheri",
],
substitutions = {
- "ARCHITECTURE": "rv32imcxcheri",
"ABI": "cheriot",
"CMODEL": "medany",
"ENDIAN": "little",
@@ -34,7 +33,6 @@
"//constraints/extension:cheri-baremetal",
],
substitutions = {
- "ARCHITECTURE": "rv32imcxcheri",
"ABI": "cheriot-baremetal",
"CMODEL": "medany",
"ENDIAN": "little",
diff --git a/platforms/cheri/riscv32/features/BUILD.bazel b/platforms/cheri/riscv32/features/BUILD.bazel
index 534d35a..fe073e5 100644
--- a/platforms/cheri/riscv32/features/BUILD.bazel
+++ b/platforms/cheri/riscv32/features/BUILD.bazel
@@ -20,7 +20,6 @@
flag_groups = [
flag_group(
flags = [
- "-march=ARCHITECTURE",
"-mcpu=cheriot",
"-mabi=ABI",
"-mcmodel=CMODEL",