diff --git a/src/basic/architecture.c b/src/basic/architecture.c
index 7ac74cd48d..730a5f2de2 100644
--- a/src/basic/architecture.c
+++ b/src/basic/architecture.c
@@ -135,39 +135,40 @@ int uname_architecture(void) {
         return _ARCHITECTURE_INVALID;
 }
 
+/* Maintain same order as in the table above. */
 static const char *const architecture_table[_ARCHITECTURE_MAX] = {
-        [ARCHITECTURE_X86] = "x86",
-        [ARCHITECTURE_X86_64] = "x86-64",
-        [ARCHITECTURE_PPC] = "ppc",
-        [ARCHITECTURE_PPC_LE] = "ppc-le",
-        [ARCHITECTURE_PPC64] = "ppc64",
-        [ARCHITECTURE_PPC64_LE] = "ppc64-le",
-        [ARCHITECTURE_IA64] = "ia64",
-        [ARCHITECTURE_PARISC] = "parisc",
-        [ARCHITECTURE_PARISC64] = "parisc64",
-        [ARCHITECTURE_S390] = "s390",
-        [ARCHITECTURE_S390X] = "s390x",
-        [ARCHITECTURE_SPARC] = "sparc",
-        [ARCHITECTURE_SPARC64] = "sparc64",
-        [ARCHITECTURE_MIPS] = "mips",
-        [ARCHITECTURE_MIPS_LE] = "mips-le",
-        [ARCHITECTURE_MIPS64] = "mips64",
+        [ARCHITECTURE_ARM64]     = "arm64",
+        [ARCHITECTURE_ARM64_BE]  = "arm64-be",
+        [ARCHITECTURE_ARM]       = "arm",
+        [ARCHITECTURE_ARM_BE]    = "arm-be",
+        [ARCHITECTURE_ALPHA]     = "alpha",
+        [ARCHITECTURE_ARC]       = "arc",
+        [ARCHITECTURE_ARC_BE]    = "arc-be",
+        [ARCHITECTURE_CRIS]      = "cris",
+        [ARCHITECTURE_X86_64]    = "x86-64",
+        [ARCHITECTURE_X86]       = "x86",
+        [ARCHITECTURE_IA64]      = "ia64",
+        [ARCHITECTURE_M68K]      = "m68k",
         [ARCHITECTURE_MIPS64_LE] = "mips64-le",
-        [ARCHITECTURE_ALPHA] = "alpha",
-        [ARCHITECTURE_ARM] = "arm",
-        [ARCHITECTURE_ARM_BE] = "arm-be",
-        [ARCHITECTURE_ARM64] = "arm64",
-        [ARCHITECTURE_ARM64_BE] = "arm64-be",
-        [ARCHITECTURE_SH] = "sh",
-        [ARCHITECTURE_SH64] = "sh64",
-        [ARCHITECTURE_M68K] = "m68k",
-        [ARCHITECTURE_TILEGX] = "tilegx",
-        [ARCHITECTURE_CRIS] = "cris",
-        [ARCHITECTURE_NIOS2] = "nios2",
-        [ARCHITECTURE_RISCV32] = "riscv32",
-        [ARCHITECTURE_RISCV64] = "riscv64",
-        [ARCHITECTURE_ARC] = "arc",
-        [ARCHITECTURE_ARC_BE] = "arc-be",
+        [ARCHITECTURE_MIPS64]    = "mips64",
+        [ARCHITECTURE_MIPS_LE]   = "mips-le",
+        [ARCHITECTURE_MIPS]      = "mips",
+        [ARCHITECTURE_NIOS2]     = "nios2",
+        [ARCHITECTURE_PARISC64]  = "parisc64",
+        [ARCHITECTURE_PARISC]    = "parisc",
+        [ARCHITECTURE_PPC64_LE]  = "ppc64-le",
+        [ARCHITECTURE_PPC64]     = "ppc64",
+        [ARCHITECTURE_PPC]       = "ppc",
+        [ARCHITECTURE_PPC_LE]    = "ppc-le",
+        [ARCHITECTURE_RISCV32]   = "riscv32",
+        [ARCHITECTURE_RISCV64]   = "riscv64",
+        [ARCHITECTURE_S390X]     = "s390x",
+        [ARCHITECTURE_S390]      = "s390",
+        [ARCHITECTURE_SH64]      = "sh64",
+        [ARCHITECTURE_SH]        = "sh",
+        [ARCHITECTURE_SPARC64]   = "sparc64",
+        [ARCHITECTURE_SPARC]     = "sparc",
+        [ARCHITECTURE_TILEGX]    = "tilegx",
 };
 
 DEFINE_STRING_TABLE_LOOKUP(architecture, int);