shared/gpt: reorder arches alphabetically

It's just too annoying to add new ones otherwise.

2 files changed, 71 insertions, 76 deletions

diff --git a/src/shared/gpt.c b/src/shared/gpt.c
index a34a3e5e3b..cdc6e09f00 100644
--- a/src/shared/gpt.c
+++ b/src/shared/gpt.c
@@ -15,12 +15,6 @@
 #endif
 
 const GptPartitionType gpt_partition_type_table[] = {
-        { GPT_ROOT_X86,                    "root-x86"                    },
-        { GPT_ROOT_X86_VERITY,             "root-x86-verity"             },
-        { GPT_ROOT_X86_VERITY_SIG,         "root-x86-verity-sig"         },
-        { GPT_ROOT_X86_64,                 "root-x86-64"                 },
-        { GPT_ROOT_X86_64_VERITY,          "root-x86-64-verity"          },
-        { GPT_ROOT_X86_64_VERITY_SIG,      "root-x86-64-verity-sig"      },
         { GPT_ROOT_ARM,                    "root-arm"                    },
         { GPT_ROOT_ARM_VERITY,             "root-arm-verity"             },
         { GPT_ROOT_ARM_VERITY_SIG,         "root-arm-verity-sig"         },
@@ -39,6 +33,12 @@ const GptPartitionType gpt_partition_type_table[] = {
         { GPT_ROOT_RISCV64,                "root-riscv64"                },
         { GPT_ROOT_RISCV64_VERITY,         "root-riscv64-verity"         },
         { GPT_ROOT_RISCV64_VERITY_SIG,     "root-riscv64-verity-sig"     },
+        { GPT_ROOT_X86,                    "root-x86"                    },
+        { GPT_ROOT_X86_64,                 "root-x86-64"                 },
+        { GPT_ROOT_X86_64_VERITY,          "root-x86-64-verity"          },
+        { GPT_ROOT_X86_64_VERITY_SIG,      "root-x86-64-verity-sig"      },
+        { GPT_ROOT_X86_VERITY,             "root-x86-verity"             },
+        { GPT_ROOT_X86_VERITY_SIG,         "root-x86-verity-sig"         },
 #ifdef GPT_ROOT_NATIVE
         { GPT_ROOT_NATIVE,                 "root"                        },
         { GPT_ROOT_NATIVE_VERITY,          "root-verity"                 },
@@ -49,12 +49,6 @@ const GptPartitionType gpt_partition_type_table[] = {
         { GPT_ROOT_SECONDARY_VERITY,       "root-secondary-verity"       },
         { GPT_ROOT_SECONDARY_VERITY_SIG,   "root-secondary-verity-sig"   },
 #endif
-        { GPT_USR_X86,                     "usr-x86"                     },
-        { GPT_USR_X86_VERITY,              "usr-x86-verity"              },
-        { GPT_USR_X86_VERITY_SIG,          "usr-x86-verity-sig"          },
-        { GPT_USR_X86_64,                  "usr-x86-64"                  },
-        { GPT_USR_X86_64_VERITY,           "usr-x86-64-verity"           },
-        { GPT_USR_X86_64_VERITY_SIG,       "usr-x86-64-verity-sig"       },
         { GPT_USR_ARM,                     "usr-arm"                     },
         { GPT_USR_ARM_VERITY,              "usr-arm-verity"              },
         { GPT_USR_ARM_VERITY_SIG,          "usr-arm-verity-sig"          },
@@ -73,6 +67,12 @@ const GptPartitionType gpt_partition_type_table[] = {
         { GPT_USR_RISCV64,                 "usr-riscv64"                 },
         { GPT_USR_RISCV64_VERITY,          "usr-riscv64-verity"          },
         { GPT_USR_RISCV64_VERITY_SIG,      "usr-riscv64-verity-sig"      },
+        { GPT_USR_X86,                     "usr-x86"                     },
+        { GPT_USR_X86_64,                  "usr-x86-64"                  },
+        { GPT_USR_X86_64_VERITY,           "usr-x86-64-verity"           },
+        { GPT_USR_X86_64_VERITY_SIG,       "usr-x86-64-verity-sig"       },
+        { GPT_USR_X86_VERITY,              "usr-x86-verity"              },
+        { GPT_USR_X86_VERITY_SIG,          "usr-x86-verity-sig"          },
 #ifdef GPT_USR_NATIVE
         { GPT_USR_NATIVE,                  "usr"                         },
         { GPT_USR_NATIVE_VERITY,           "usr-verity"                  },
@@ -143,50 +143,50 @@ int gpt_partition_label_valid(const char *s) {
 
 bool gpt_partition_type_is_root(sd_id128_t id) {
         return sd_id128_in_set(id,
-                               GPT_ROOT_X86,
-                               GPT_ROOT_X86_64,
                                GPT_ROOT_ARM,
                                GPT_ROOT_ARM_64,
                                GPT_ROOT_IA64,
                                GPT_ROOT_LOONGARCH64,
                                GPT_ROOT_RISCV32,
-                               GPT_ROOT_RISCV64);
+                               GPT_ROOT_RISCV64,
+                               GPT_ROOT_X86,
+                               GPT_ROOT_X86_64);
 }
 
 bool gpt_partition_type_is_root_verity(sd_id128_t id) {
         return sd_id128_in_set(id,
-                               GPT_ROOT_X86_VERITY,
-                               GPT_ROOT_X86_64_VERITY,
                                GPT_ROOT_ARM_VERITY,
                                GPT_ROOT_ARM_64_VERITY,
                                GPT_ROOT_IA64_VERITY,
                                GPT_ROOT_LOONGARCH64_VERITY,
                                GPT_ROOT_RISCV32_VERITY,
-                               GPT_ROOT_RISCV64_VERITY);
+                               GPT_ROOT_RISCV64_VERITY,
+                               GPT_ROOT_X86_VERITY,
+                               GPT_ROOT_X86_64_VERITY);
 }
 
 bool gpt_partition_type_is_usr(sd_id128_t id) {
         return sd_id128_in_set(id,
-                               GPT_USR_X86,
-                               GPT_USR_X86_64,
                                GPT_USR_ARM,
                                GPT_USR_ARM_64,
                                GPT_USR_IA64,
                                GPT_USR_LOONGARCH64,
                                GPT_USR_RISCV32,
-                               GPT_USR_RISCV64);
+                               GPT_USR_RISCV64,
+                               GPT_USR_X86,
+                               GPT_USR_X86_64);
 }
 
 bool gpt_partition_type_is_usr_verity(sd_id128_t id) {
         return sd_id128_in_set(id,
-                               GPT_USR_X86_VERITY,
-                               GPT_USR_X86_64_VERITY,
                                GPT_USR_ARM_VERITY,
                                GPT_USR_ARM_64_VERITY,
                                GPT_USR_IA64_VERITY,
                                GPT_USR_LOONGARCH64_VERITY,
                                GPT_USR_RISCV32_VERITY,
-                               GPT_USR_RISCV64_VERITY);
+                               GPT_USR_RISCV64_VERITY,
+                               GPT_USR_X86_VERITY,
+                               GPT_USR_X86_64_VERITY);
 }
 
 bool gpt_partition_type_knows_read_only(sd_id128_t id) {
diff --git a/src/shared/gpt.h b/src/shared/gpt.h
index 01833353b8..efd9ef2c7d 100644
--- a/src/shared/gpt.h
+++ b/src/shared/gpt.h
@@ -7,22 +7,22 @@
 
 #include "id128-util.h"
 
-#define GPT_ROOT_X86         SD_ID128_MAKE(44,47,95,40,f2,97,41,b2,9a,f7,d1,31,d5,f0,45,8a)
-#define GPT_ROOT_X86_64      SD_ID128_MAKE(4f,68,bc,e3,e8,cd,4d,b1,96,e7,fb,ca,f9,84,b7,09)
 #define GPT_ROOT_ARM         SD_ID128_MAKE(69,da,d7,10,2c,e4,4e,3c,b1,6c,21,a1,d4,9a,be,d3)
 #define GPT_ROOT_ARM_64      SD_ID128_MAKE(b9,21,b0,45,1d,f0,41,c3,af,44,4c,6f,28,0d,3f,ae)
 #define GPT_ROOT_IA64        SD_ID128_MAKE(99,3d,8d,3d,f8,0e,42,25,85,5a,9d,af,8e,d7,ea,97)
 #define GPT_ROOT_LOONGARCH64 SD_ID128_MAKE(77,05,58,00,79,2c,4f,94,b3,9a,99,c9,1b,76,2b,b6)
 #define GPT_ROOT_RISCV32     SD_ID128_MAKE(60,d5,a7,fe,8e,7d,43,5c,b7,14,3d,d8,16,21,44,e1)
 #define GPT_ROOT_RISCV64     SD_ID128_MAKE(72,ec,70,a6,cf,74,40,e6,bd,49,4b,da,08,e8,f2,24)
-#define GPT_USR_X86          SD_ID128_MAKE(75,25,0d,76,8c,c6,45,8e,bd,66,bd,47,cc,81,a8,12)
-#define GPT_USR_X86_64       SD_ID128_MAKE(84,84,68,0c,95,21,48,c6,9c,11,b0,72,06,56,f6,9e)
+#define GPT_ROOT_X86         SD_ID128_MAKE(44,47,95,40,f2,97,41,b2,9a,f7,d1,31,d5,f0,45,8a)
+#define GPT_ROOT_X86_64      SD_ID128_MAKE(4f,68,bc,e3,e8,cd,4d,b1,96,e7,fb,ca,f9,84,b7,09)
 #define GPT_USR_ARM          SD_ID128_MAKE(7d,03,59,a3,02,b3,4f,0a,86,5c,65,44,03,e7,06,25)
 #define GPT_USR_ARM_64       SD_ID128_MAKE(b0,e0,10,50,ee,5f,43,90,94,9a,91,01,b1,71,04,e9)
 #define GPT_USR_IA64         SD_ID128_MAKE(43,01,d2,a6,4e,3b,4b,2a,bb,94,9e,0b,2c,42,25,ea)
 #define GPT_USR_LOONGARCH64  SD_ID128_MAKE(e6,11,c7,02,57,5c,4c,be,9a,46,43,4f,a0,bf,7e,3f)
 #define GPT_USR_RISCV32      SD_ID128_MAKE(b9,33,fb,22,5c,3f,4f,91,af,90,e2,bb,0f,a5,07,02)
 #define GPT_USR_RISCV64      SD_ID128_MAKE(be,ae,c3,4b,84,42,43,9b,a4,0b,98,43,81,ed,09,7d)
+#define GPT_USR_X86          SD_ID128_MAKE(75,25,0d,76,8c,c6,45,8e,bd,66,bd,47,cc,81,a8,12)
+#define GPT_USR_X86_64       SD_ID128_MAKE(84,84,68,0c,95,21,48,c6,9c,11,b0,72,06,56,f6,9e)
 #define GPT_ESP              SD_ID128_MAKE(c1,2a,73,28,f8,1f,11,d2,ba,4b,00,a0,c9,3e,c9,3b)
 #define GPT_XBOOTLDR         SD_ID128_MAKE(bc,13,c2,ff,59,e6,42,62,a3,52,b2,75,fd,6f,71,72)
 #define GPT_SWAP             SD_ID128_MAKE(06,57,fd,6d,a4,ab,43,c4,84,e5,09,33,c8,4b,4f,4f)
@@ -35,73 +35,43 @@
 
 /* Verity partitions for the root partitions above (we only define them for the root and /usr partitions,
  * because only they are commonly read-only and hence suitable for verity). */
-#define GPT_ROOT_X86_VERITY         SD_ID128_MAKE(d1,3c,5d,3b,b5,d1,42,2a,b2,9f,94,54,fd,c8,9d,76)
-#define GPT_ROOT_X86_64_VERITY      SD_ID128_MAKE(2c,73,57,ed,eb,d2,46,d9,ae,c1,23,d4,37,ec,2b,f5)
 #define GPT_ROOT_ARM_VERITY         SD_ID128_MAKE(73,86,cd,f2,20,3c,47,a9,a4,98,f2,ec,ce,45,a2,d6)
 #define GPT_ROOT_ARM_64_VERITY      SD_ID128_MAKE(df,33,00,ce,d6,9f,4c,92,97,8c,9b,fb,0f,38,d8,20)
 #define GPT_ROOT_IA64_VERITY        SD_ID128_MAKE(86,ed,10,d5,b6,07,45,bb,89,57,d3,50,f2,3d,05,71)
 #define GPT_ROOT_LOONGARCH64_VERITY SD_ID128_MAKE(f3,39,3b,22,e9,af,46,13,a9,48,9d,3b,fb,d0,c5,35)
 #define GPT_ROOT_RISCV32_VERITY     SD_ID128_MAKE(ae,02,53,be,11,67,40,07,ac,68,43,92,6c,14,c5,de)
 #define GPT_ROOT_RISCV64_VERITY     SD_ID128_MAKE(b6,ed,55,82,44,0b,42,09,b8,da,5f,f7,c4,19,ea,3d)
-#define GPT_USR_X86_VERITY          SD_ID128_MAKE(8f,46,1b,0d,14,ee,4e,81,9a,a9,04,9b,6f,b9,7a,bd)
-#define GPT_USR_X86_64_VERITY       SD_ID128_MAKE(77,ff,5f,63,e7,b6,46,33,ac,f4,15,65,b8,64,c0,e6)
+#define GPT_ROOT_X86_64_VERITY      SD_ID128_MAKE(2c,73,57,ed,eb,d2,46,d9,ae,c1,23,d4,37,ec,2b,f5)
+#define GPT_ROOT_X86_VERITY         SD_ID128_MAKE(d1,3c,5d,3b,b5,d1,42,2a,b2,9f,94,54,fd,c8,9d,76)
 #define GPT_USR_ARM_VERITY          SD_ID128_MAKE(c2,15,d7,51,7b,cd,46,49,be,90,66,27,49,0a,4c,05)
 #define GPT_USR_ARM_64_VERITY       SD_ID128_MAKE(6e,11,a4,e7,fb,ca,4d,ed,b9,e9,e1,a5,12,bb,66,4e)
 #define GPT_USR_IA64_VERITY         SD_ID128_MAKE(6a,49,1e,03,3b,e7,45,45,8e,38,83,32,0e,0e,a8,80)
 #define GPT_USR_LOONGARCH64_VERITY  SD_ID128_MAKE(f4,6b,2c,26,59,ae,48,f0,91,06,c5,0e,d4,7f,67,3d)
 #define GPT_USR_RISCV32_VERITY      SD_ID128_MAKE(cb,1e,e4,e3,8c,d0,41,36,a0,a4,aa,61,a3,2e,87,30)
 #define GPT_USR_RISCV64_VERITY      SD_ID128_MAKE(8f,10,56,be,9b,05,47,c4,81,d6,be,53,12,8e,5b,54)
+#define GPT_USR_X86_64_VERITY       SD_ID128_MAKE(77,ff,5f,63,e7,b6,46,33,ac,f4,15,65,b8,64,c0,e6)
+#define GPT_USR_X86_VERITY          SD_ID128_MAKE(8f,46,1b,0d,14,ee,4e,81,9a,a9,04,9b,6f,b9,7a,bd)
 
 /* PKCS#7 Signatures for the Verity Root Hashes */
-#define GPT_ROOT_X86_VERITY_SIG         SD_ID128_MAKE(59,96,fc,05,10,9c,48,de,80,8b,23,fa,08,30,b6,76)
-#define GPT_ROOT_X86_64_VERITY_SIG      SD_ID128_MAKE(41,09,2b,05,9f,c8,45,23,99,4f,2d,ef,04,08,b1,76)
 #define GPT_ROOT_ARM_VERITY_SIG         SD_ID128_MAKE(42,b0,45,5f,eb,11,49,1d,98,d3,56,14,5b,a9,d0,37)
 #define GPT_ROOT_ARM_64_VERITY_SIG      SD_ID128_MAKE(6d,b6,9d,e6,29,f4,47,58,a7,a5,96,21,90,f0,0c,e3)
 #define GPT_ROOT_IA64_VERITY_SIG        SD_ID128_MAKE(e9,8b,36,ee,32,ba,48,82,9b,12,0c,e1,46,55,f4,6a)
 #define GPT_ROOT_LOONGARCH64_VERITY_SIG SD_ID128_MAKE(5a,fb,67,eb,ec,c8,4f,85,ae,8e,ac,1e,7c,50,e7,d0)
 #define GPT_ROOT_RISCV32_VERITY_SIG     SD_ID128_MAKE(3a,11,2a,75,87,29,43,80,b4,cf,76,4d,79,93,44,48)
 #define GPT_ROOT_RISCV64_VERITY_SIG     SD_ID128_MAKE(ef,e0,f0,87,ea,8d,44,69,82,1a,4c,2a,96,a8,38,6a)
-#define GPT_USR_X86_VERITY_SIG          SD_ID128_MAKE(97,4a,71,c0,de,41,43,c3,be,5d,5c,5c,cd,1a,d2,c0)
-#define GPT_USR_X86_64_VERITY_SIG       SD_ID128_MAKE(e7,bb,33,fb,06,cf,4e,81,82,73,e5,43,b4,13,e2,e2)
+#define GPT_ROOT_X86_64_VERITY_SIG      SD_ID128_MAKE(41,09,2b,05,9f,c8,45,23,99,4f,2d,ef,04,08,b1,76)
+#define GPT_ROOT_X86_VERITY_SIG         SD_ID128_MAKE(59,96,fc,05,10,9c,48,de,80,8b,23,fa,08,30,b6,76)
 #define GPT_USR_ARM_VERITY_SIG          SD_ID128_MAKE(d7,ff,81,2f,37,d1,49,02,a8,10,d7,6b,a5,7b,97,5a)
 #define GPT_USR_ARM_64_VERITY_SIG       SD_ID128_MAKE(c2,3c,e4,ff,44,bd,4b,00,b2,d4,b4,1b,34,19,e0,2a)
 #define GPT_USR_IA64_VERITY_SIG         SD_ID128_MAKE(8d,e5,8b,c2,2a,43,46,0d,b1,4e,a7,6e,4a,17,b4,7f)
 #define GPT_USR_LOONGARCH64_VERITY_SIG  SD_ID128_MAKE(b0,24,f3,15,d3,30,44,4c,84,61,44,bb,de,52,4e,99)
 #define GPT_USR_RISCV32_VERITY_SIG      SD_ID128_MAKE(c3,83,6a,13,31,37,45,ba,b5,83,b1,6c,50,fe,5e,b4)
 #define GPT_USR_RISCV64_VERITY_SIG      SD_ID128_MAKE(d2,f9,00,0a,7a,18,45,3f,b5,cd,4d,32,f7,7a,7b,32)
+#define GPT_USR_X86_64_VERITY_SIG       SD_ID128_MAKE(e7,bb,33,fb,06,cf,4e,81,82,73,e5,43,b4,13,e2,e2)
+#define GPT_USR_X86_VERITY_SIG          SD_ID128_MAKE(97,4a,71,c0,de,41,43,c3,be,5d,5c,5c,cd,1a,d2,c0)
 
-#if defined(__x86_64__)
-#  define GPT_ROOT_NATIVE GPT_ROOT_X86_64
-#  define GPT_ROOT_SECONDARY GPT_ROOT_X86
-#  define GPT_ROOT_NATIVE_VERITY GPT_ROOT_X86_64_VERITY
-#  define GPT_ROOT_SECONDARY_VERITY GPT_ROOT_X86_VERITY
-#  define GPT_ROOT_NATIVE_VERITY_SIG GPT_ROOT_X86_64_VERITY_SIG
-#  define GPT_ROOT_SECONDARY_VERITY_SIG GPT_ROOT_X86_VERITY_SIG
-#  define GPT_USR_NATIVE GPT_USR_X86_64
-#  define GPT_USR_SECONDARY GPT_USR_X86
-#  define GPT_USR_NATIVE_VERITY GPT_USR_X86_64_VERITY
-#  define GPT_USR_SECONDARY_VERITY GPT_USR_X86_VERITY
-#  define GPT_USR_NATIVE_VERITY_SIG GPT_USR_X86_64_VERITY_SIG
-#  define GPT_USR_SECONDARY_VERITY_SIG GPT_USR_X86_VERITY_SIG
-#elif defined(__i386__)
-#  define GPT_ROOT_NATIVE GPT_ROOT_X86
-#  define GPT_ROOT_NATIVE_VERITY GPT_ROOT_X86_VERITY
-#  define GPT_ROOT_NATIVE_VERITY_SIG GPT_ROOT_X86_VERITY_SIG
-#  define GPT_USR_NATIVE GPT_USR_X86
-#  define GPT_USR_NATIVE_VERITY GPT_USR_X86_VERITY
-#  define GPT_USR_NATIVE_VERITY_SIG GPT_USR_X86_VERITY_SIG
-#endif
-
-#if defined(__ia64__)
-#  define GPT_ROOT_NATIVE GPT_ROOT_IA64
-#  define GPT_ROOT_NATIVE_VERITY GPT_ROOT_IA64_VERITY
-#  define GPT_ROOT_NATIVE_VERITY_SIG GPT_ROOT_IA64_VERITY_SIG
-#  define GPT_USR_NATIVE GPT_USR_IA64
-#  define GPT_USR_NATIVE_VERITY GPT_USR_IA64_VERITY
-#  define GPT_USR_NATIVE_VERITY_SIG GPT_USR_IA64_VERITY_SIG
-#endif
-
-#if defined(__aarch64__) && (__BYTE_ORDER != __BIG_ENDIAN)
+/* Maintain same order as above */
+#if defined(__aarch64__) && __BYTE_ORDER != __BIG_ENDIAN
 #  define GPT_ROOT_NATIVE GPT_ROOT_ARM_64
 #  define GPT_ROOT_SECONDARY GPT_ROOT_ARM
 #  define GPT_ROOT_NATIVE_VERITY GPT_ROOT_ARM_64_VERITY
@@ -114,40 +84,65 @@
 #  define GPT_USR_SECONDARY_VERITY GPT_USR_ARM_VERITY
 #  define GPT_USR_NATIVE_VERITY_SIG GPT_USR_ARM_64_VERITY_SIG
 #  define GPT_USR_SECONDARY_VERITY_SIG GPT_USR_ARM_VERITY_SIG
-#elif defined(__arm__) && (__BYTE_ORDER != __BIG_ENDIAN)
+#elif defined(__arm__) && __BYTE_ORDER != __BIG_ENDIAN
 #  define GPT_ROOT_NATIVE GPT_ROOT_ARM
 #  define GPT_ROOT_NATIVE_VERITY GPT_ROOT_ARM_VERITY
 #  define GPT_ROOT_NATIVE_VERITY_SIG GPT_ROOT_ARM_VERITY_SIG
 #  define GPT_USR_NATIVE GPT_USR_ARM
 #  define GPT_USR_NATIVE_VERITY GPT_USR_ARM_VERITY
 #  define GPT_USR_NATIVE_VERITY_SIG GPT_USR_ARM_VERITY_SIG
-#endif
 
-#if defined(__loongarch64)
+#elif defined(__ia64__)
+#  define GPT_ROOT_NATIVE GPT_ROOT_IA64
+#  define GPT_ROOT_NATIVE_VERITY GPT_ROOT_IA64_VERITY
+#  define GPT_ROOT_NATIVE_VERITY_SIG GPT_ROOT_IA64_VERITY_SIG
+#  define GPT_USR_NATIVE GPT_USR_IA64
+#  define GPT_USR_NATIVE_VERITY GPT_USR_IA64_VERITY
+#  define GPT_USR_NATIVE_VERITY_SIG GPT_USR_IA64_VERITY_SIG
+
+#elif defined(__loongarch64)
 #  define GPT_ROOT_NATIVE GPT_ROOT_LOONGARCH64
 #  define GPT_ROOT_NATIVE_VERITY GPT_ROOT_LOONGARCH64_VERITY
 #  define GPT_ROOT_NATIVE_VERITY_SIG GPT_ROOT_LOONGARCH64_VERITY_SIG
 #  define GPT_USR_NATIVE GPT_USR_LOONGARCH64
 #  define GPT_USR_NATIVE_VERITY GPT_USR_LOONGARCH64_VERITY
 #  define GPT_USR_NATIVE_VERITY_SIG GPT_USR_LOONGARCH64_VERITY_SIG
-#endif
 
-#if defined(__riscv)
-#if (__riscv_xlen == 32)
+#elif defined(__riscv) && __riscv_xlen == 32
 #  define GPT_ROOT_NATIVE GPT_ROOT_RISCV32
 #  define GPT_ROOT_NATIVE_VERITY GPT_ROOT_RISCV32_VERITY
 #  define GPT_ROOT_NATIVE_VERITY_SIG GPT_ROOT_RISCV32_VERITY_SIG
 #  define GPT_USR_NATIVE GPT_USR_RISCV32
 #  define GPT_USR_NATIVE_VERITY GPT_USR_RISCV32_VERITY
 #  define GPT_USR_NATIVE_VERITY_SIG GPT_USR_RISCV32_VERITY_SIG
-#elif (__riscv_xlen == 64)
+#elif defined(__riscv) && __riscv_xlen == 64
 #  define GPT_ROOT_NATIVE GPT_ROOT_RISCV64
 #  define GPT_ROOT_NATIVE_VERITY GPT_ROOT_RISCV64_VERITY
 #  define GPT_ROOT_NATIVE_VERITY_SIG GPT_ROOT_RISCV64_VERITY_SIG
 #  define GPT_USR_NATIVE GPT_USR_RISCV64
 #  define GPT_USR_NATIVE_VERITY GPT_USR_RISCV64_VERITY
 #  define GPT_USR_NATIVE_VERITY_SIG GPT_USR_RISCV64_VERITY_SIG
-#endif
+
+#elif defined(__x86_64__)
+#  define GPT_ROOT_NATIVE GPT_ROOT_X86_64
+#  define GPT_ROOT_SECONDARY GPT_ROOT_X86
+#  define GPT_ROOT_NATIVE_VERITY GPT_ROOT_X86_64_VERITY
+#  define GPT_ROOT_SECONDARY_VERITY GPT_ROOT_X86_VERITY
+#  define GPT_ROOT_NATIVE_VERITY_SIG GPT_ROOT_X86_64_VERITY_SIG
+#  define GPT_ROOT_SECONDARY_VERITY_SIG GPT_ROOT_X86_VERITY_SIG
+#  define GPT_USR_NATIVE GPT_USR_X86_64
+#  define GPT_USR_SECONDARY GPT_USR_X86
+#  define GPT_USR_NATIVE_VERITY GPT_USR_X86_64_VERITY
+#  define GPT_USR_SECONDARY_VERITY GPT_USR_X86_VERITY
+#  define GPT_USR_NATIVE_VERITY_SIG GPT_USR_X86_64_VERITY_SIG
+#  define GPT_USR_SECONDARY_VERITY_SIG GPT_USR_X86_VERITY_SIG
+#elif defined(__i386__)
+#  define GPT_ROOT_NATIVE GPT_ROOT_X86
+#  define GPT_ROOT_NATIVE_VERITY GPT_ROOT_X86_VERITY
+#  define GPT_ROOT_NATIVE_VERITY_SIG GPT_ROOT_X86_VERITY_SIG
+#  define GPT_USR_NATIVE GPT_USR_X86
+#  define GPT_USR_NATIVE_VERITY GPT_USR_X86_VERITY
+#  define GPT_USR_NATIVE_VERITY_SIG GPT_USR_X86_VERITY_SIG
 #endif
 
 #define GPT_FLAG_REQUIRED_PARTITION (1ULL << 0)