merge #4031 into opencontainers/runc:main

Akihiro Suda (1):
  docs: clarify the supported architectures (No MIPS)

LGTMs: kolyskin cyphar

docs/spec-conformance.md

@@ -7,8 +7,6 @@ The following features are not implemented yet:
 
 Spec version | Feature                                  | PR
 -------------|------------------------------------------|----------------------------------------------------------
-v1.0.0       | `SCMP_ARCH_PARISC`                       | Unplanned, due to lack of users
-v1.0.0       | `SCMP_ARCH_PARISC64`                     | Unplanned, due to lack of users
 v1.0.2       | `.linux.personality`                     | [#3126](https://github.com/opencontainers/runc/pull/3126)
 v1.1.0       | `SECCOMP_FILTER_FLAG_WAIT_KILLABLE_RECV` | [#3862](https://github.com/opencontainers/runc/pull/3862)
 v1.1.0       | rsvd hugetlb cgroup                      | TODO ([#3859](https://github.com/opencontainers/runc/issues/3859))
@@ -21,3 +19,20 @@ Spec version | Feature                                  | Limitation
 -------------|------------------------------------------|----------------------------------------------------------
 v1.1.0       | `.[]mounts.uidMappings`                  | Requires using UserNS with identical uidMappings
 v1.1.0       | `.[]mounts.gidMappings`                  | Requires using UserNS with identical gidMappings
+
+## Architectures
+
+The following architectures are supported:
+
+runc binary  | seccomp
+-------------|-------------------------------------------------------
+`amd64`      | `SCMP_ARCH_X86`, `SCMP_ARCH_X86_64`, `SCMP_ARCH_X32`
+`arm64`      | `SCMP_ARCH_ARM`, `SCMP_ARCH_AARCH64`
+`armel`      | `SCMP_ARCH_ARM`
+`armhf`      | `SCMP_ARCH_ARM`
+`ppc64le`    | `SCMP_ARCH_PPC64LE`
+`riscv64`    | `SCMP_ARCH_RISCV64`
+`s390x`      | `SCMP_ARCH_S390`, `SCMP_ARCH_S390X`
+
+The runc binary might be compilable for i386, big-endian PPC64,
+and several MIPS variants too, but these architectures are not officially supported.