Skip to content

Commit 086df29

Browse files
keszybzkeszybz
committed
shared/gpt: reorder arches alphabetically
It's just too annoying to add new ones otherwise.
1 parent 1aeb037 commit 086df29

File tree

3 files changed

+96
-102
lines changed

3 files changed

+96
-102
lines changed

‎src/basic/architecture.h‎

Lines changed: 25 additions & 26 deletions
Original file line numberDiff line numberDiff line change
@@ -8,42 +8,41 @@
88

99
/* A cleaned up architecture definition. We don't want to get lost in
1010
* processor features, models, generations or even ABIs. Hence we
11-
* focus on general family, and distinguish word width and
12-
* endianness. */
11+
* focus on general family, and distinguish word width and endianness. */
1312

1413
enum {
15-
ARCHITECTURE_X86 = 0,
16-
ARCHITECTURE_X86_64,
17-
ARCHITECTURE_PPC,
18-
ARCHITECTURE_PPC_LE,
19-
ARCHITECTURE_PPC64,
20-
ARCHITECTURE_PPC64_LE,
21-
ARCHITECTURE_IA64,
22-
ARCHITECTURE_PARISC,
23-
ARCHITECTURE_PARISC64,
24-
ARCHITECTURE_S390,
25-
ARCHITECTURE_S390X,
26-
ARCHITECTURE_SPARC,
27-
ARCHITECTURE_SPARC64,
28-
ARCHITECTURE_MIPS,
29-
ARCHITECTURE_MIPS_LE,
30-
ARCHITECTURE_MIPS64,
31-
ARCHITECTURE_MIPS64_LE,
3214
ARCHITECTURE_ALPHA,
15+
ARCHITECTURE_ARC,
16+
ARCHITECTURE_ARC_BE,
3317
ARCHITECTURE_ARM,
34-
ARCHITECTURE_ARM_BE,
3518
ARCHITECTURE_ARM64,
3619
ARCHITECTURE_ARM64_BE,
37-
ARCHITECTURE_SH,
38-
ARCHITECTURE_SH64,
39-
ARCHITECTURE_M68K,
40-
ARCHITECTURE_TILEGX,
20+
ARCHITECTURE_ARM_BE,
4121
ARCHITECTURE_CRIS,
22+
ARCHITECTURE_IA64,
23+
ARCHITECTURE_M68K,
24+
ARCHITECTURE_MIPS,
25+
ARCHITECTURE_MIPS64,
26+
ARCHITECTURE_MIPS64_LE,
27+
ARCHITECTURE_MIPS_LE,
4228
ARCHITECTURE_NIOS2,
29+
ARCHITECTURE_PARISC,
30+
ARCHITECTURE_PARISC64,
31+
ARCHITECTURE_PPC,
32+
ARCHITECTURE_PPC64,
33+
ARCHITECTURE_PPC64_LE,
34+
ARCHITECTURE_PPC_LE,
4335
ARCHITECTURE_RISCV32,
4436
ARCHITECTURE_RISCV64,
45-
ARCHITECTURE_ARC,
46-
ARCHITECTURE_ARC_BE,
37+
ARCHITECTURE_S390,
38+
ARCHITECTURE_S390X,
39+
ARCHITECTURE_SH,
40+
ARCHITECTURE_SH64,
41+
ARCHITECTURE_SPARC,
42+
ARCHITECTURE_SPARC64,
43+
ARCHITECTURE_TILEGX,
44+
ARCHITECTURE_X86,
45+
ARCHITECTURE_X86_64,
4746
_ARCHITECTURE_MAX,
4847
_ARCHITECTURE_INVALID = -EINVAL,
4948
};

‎src/shared/gpt.c‎

Lines changed: 24 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -15,12 +15,6 @@
1515
#endif
1616

1717
const GptPartitionType gpt_partition_type_table[] = {
18-
{ GPT_ROOT_X86, "root-x86" },
19-
{ GPT_ROOT_X86_VERITY, "root-x86-verity" },
20-
{ GPT_ROOT_X86_VERITY_SIG, "root-x86-verity-sig" },
21-
{ GPT_ROOT_X86_64, "root-x86-64" },
22-
{ GPT_ROOT_X86_64_VERITY, "root-x86-64-verity" },
23-
{ GPT_ROOT_X86_64_VERITY_SIG, "root-x86-64-verity-sig" },
2418
{ GPT_ROOT_ARM, "root-arm" },
2519
{ GPT_ROOT_ARM_VERITY, "root-arm-verity" },
2620
{ GPT_ROOT_ARM_VERITY_SIG, "root-arm-verity-sig" },
@@ -39,6 +33,12 @@ const GptPartitionType gpt_partition_type_table[] = {
3933
{ GPT_ROOT_RISCV64, "root-riscv64" },
4034
{ GPT_ROOT_RISCV64_VERITY, "root-riscv64-verity" },
4135
{ GPT_ROOT_RISCV64_VERITY_SIG, "root-riscv64-verity-sig" },
36+
{ GPT_ROOT_X86, "root-x86" },
37+
{ GPT_ROOT_X86_64, "root-x86-64" },
38+
{ GPT_ROOT_X86_64_VERITY, "root-x86-64-verity" },
39+
{ GPT_ROOT_X86_64_VERITY_SIG, "root-x86-64-verity-sig" },
40+
{ GPT_ROOT_X86_VERITY, "root-x86-verity" },
41+
{ GPT_ROOT_X86_VERITY_SIG, "root-x86-verity-sig" },
4242
#ifdef GPT_ROOT_NATIVE
4343
{ GPT_ROOT_NATIVE, "root" },
4444
{ GPT_ROOT_NATIVE_VERITY, "root-verity" },
@@ -49,12 +49,6 @@ const GptPartitionType gpt_partition_type_table[] = {
4949
{ GPT_ROOT_SECONDARY_VERITY, "root-secondary-verity" },
5050
{ GPT_ROOT_SECONDARY_VERITY_SIG, "root-secondary-verity-sig" },
5151
#endif
52-
{ GPT_USR_X86, "usr-x86" },
53-
{ GPT_USR_X86_VERITY, "usr-x86-verity" },
54-
{ GPT_USR_X86_VERITY_SIG, "usr-x86-verity-sig" },
55-
{ GPT_USR_X86_64, "usr-x86-64" },
56-
{ GPT_USR_X86_64_VERITY, "usr-x86-64-verity" },
57-
{ GPT_USR_X86_64_VERITY_SIG, "usr-x86-64-verity-sig" },
5852
{ GPT_USR_ARM, "usr-arm" },
5953
{ GPT_USR_ARM_VERITY, "usr-arm-verity" },
6054
{ GPT_USR_ARM_VERITY_SIG, "usr-arm-verity-sig" },
@@ -73,6 +67,12 @@ const GptPartitionType gpt_partition_type_table[] = {
7367
{ GPT_USR_RISCV64, "usr-riscv64" },
7468
{ GPT_USR_RISCV64_VERITY, "usr-riscv64-verity" },
7569
{ GPT_USR_RISCV64_VERITY_SIG, "usr-riscv64-verity-sig" },
70+
{ GPT_USR_X86, "usr-x86" },
71+
{ GPT_USR_X86_64, "usr-x86-64" },
72+
{ GPT_USR_X86_64_VERITY, "usr-x86-64-verity" },
73+
{ GPT_USR_X86_64_VERITY_SIG, "usr-x86-64-verity-sig" },
74+
{ GPT_USR_X86_VERITY, "usr-x86-verity" },
75+
{ GPT_USR_X86_VERITY_SIG, "usr-x86-verity-sig" },
7676
#ifdef GPT_USR_NATIVE
7777
{ GPT_USR_NATIVE, "usr" },
7878
{ GPT_USR_NATIVE_VERITY, "usr-verity" },
@@ -143,50 +143,50 @@ int gpt_partition_label_valid(const char *s) {
143143

144144
bool gpt_partition_type_is_root(sd_id128_t id) {
145145
return sd_id128_in_set(id,
146-
GPT_ROOT_X86,
147-
GPT_ROOT_X86_64,
148146
GPT_ROOT_ARM,
149147
GPT_ROOT_ARM_64,
150148
GPT_ROOT_IA64,
151149
GPT_ROOT_LOONGARCH64,
152150
GPT_ROOT_RISCV32,
153-
GPT_ROOT_RISCV64);
151+
GPT_ROOT_RISCV64,
152+
GPT_ROOT_X86,
153+
GPT_ROOT_X86_64);
154154
}
155155

156156
bool gpt_partition_type_is_root_verity(sd_id128_t id) {
157157
return sd_id128_in_set(id,
158-
GPT_ROOT_X86_VERITY,
159-
GPT_ROOT_X86_64_VERITY,
160158
GPT_ROOT_ARM_VERITY,
161159
GPT_ROOT_ARM_64_VERITY,
162160
GPT_ROOT_IA64_VERITY,
163161
GPT_ROOT_LOONGARCH64_VERITY,
164162
GPT_ROOT_RISCV32_VERITY,
165-
GPT_ROOT_RISCV64_VERITY);
163+
GPT_ROOT_RISCV64_VERITY,
164+
GPT_ROOT_X86_VERITY,
165+
GPT_ROOT_X86_64_VERITY);
166166
}
167167

168168
bool gpt_partition_type_is_usr(sd_id128_t id) {
169169
return sd_id128_in_set(id,
170-
GPT_USR_X86,
171-
GPT_USR_X86_64,
172170
GPT_USR_ARM,
173171
GPT_USR_ARM_64,
174172
GPT_USR_IA64,
175173
GPT_USR_LOONGARCH64,
176174
GPT_USR_RISCV32,
177-
GPT_USR_RISCV64);
175+
GPT_USR_RISCV64,
176+
GPT_USR_X86,
177+
GPT_USR_X86_64);
178178
}
179179

180180
bool gpt_partition_type_is_usr_verity(sd_id128_t id) {
181181
return sd_id128_in_set(id,
182-
GPT_USR_X86_VERITY,
183-
GPT_USR_X86_64_VERITY,
184182
GPT_USR_ARM_VERITY,
185183
GPT_USR_ARM_64_VERITY,
186184
GPT_USR_IA64_VERITY,
187185
GPT_USR_LOONGARCH64_VERITY,
188186
GPT_USR_RISCV32_VERITY,
189-
GPT_USR_RISCV64_VERITY);
187+
GPT_USR_RISCV64_VERITY,
188+
GPT_USR_X86_VERITY,
189+
GPT_USR_X86_64_VERITY);
190190
}
191191

192192
bool gpt_partition_type_knows_read_only(sd_id128_t id) {

‎src/shared/gpt.h‎

Lines changed: 47 additions & 52 deletions
Original file line numberDiff line numberDiff line change
@@ -7,22 +7,22 @@
77

88
#include "id128-util.h"
99

10-
#define GPT_ROOT_X86 SD_ID128_MAKE(44,47,95,40,f2,97,41,b2,9a,f7,d1,31,d5,f0,45,8a)
11-
#define GPT_ROOT_X86_64 SD_ID128_MAKE(4f,68,bc,e3,e8,cd,4d,b1,96,e7,fb,ca,f9,84,b7,09)
1210
#define GPT_ROOT_ARM SD_ID128_MAKE(69,da,d7,10,2c,e4,4e,3c,b1,6c,21,a1,d4,9a,be,d3)
1311
#define GPT_ROOT_ARM_64 SD_ID128_MAKE(b9,21,b0,45,1d,f0,41,c3,af,44,4c,6f,28,0d,3f,ae)
1412
#define GPT_ROOT_IA64 SD_ID128_MAKE(99,3d,8d,3d,f8,0e,42,25,85,5a,9d,af,8e,d7,ea,97)
1513
#define GPT_ROOT_LOONGARCH64 SD_ID128_MAKE(77,05,58,00,79,2c,4f,94,b3,9a,99,c9,1b,76,2b,b6)
1614
#define GPT_ROOT_RISCV32 SD_ID128_MAKE(60,d5,a7,fe,8e,7d,43,5c,b7,14,3d,d8,16,21,44,e1)
1715
#define GPT_ROOT_RISCV64 SD_ID128_MAKE(72,ec,70,a6,cf,74,40,e6,bd,49,4b,da,08,e8,f2,24)
18-
#define GPT_USR_X86 SD_ID128_MAKE(75,25,0d,76,8c,c6,45,8e,bd,66,bd,47,cc,81,a8,12)
19-
#define GPT_USR_X86_64 SD_ID128_MAKE(84,84,68,0c,95,21,48,c6,9c,11,b0,72,06,56,f6,9e)
16+
#define GPT_ROOT_X86 SD_ID128_MAKE(44,47,95,40,f2,97,41,b2,9a,f7,d1,31,d5,f0,45,8a)
17+
#define GPT_ROOT_X86_64 SD_ID128_MAKE(4f,68,bc,e3,e8,cd,4d,b1,96,e7,fb,ca,f9,84,b7,09)
2018
#define GPT_USR_ARM SD_ID128_MAKE(7d,03,59,a3,02,b3,4f,0a,86,5c,65,44,03,e7,06,25)
2119
#define GPT_USR_ARM_64 SD_ID128_MAKE(b0,e0,10,50,ee,5f,43,90,94,9a,91,01,b1,71,04,e9)
2220
#define GPT_USR_IA64 SD_ID128_MAKE(43,01,d2,a6,4e,3b,4b,2a,bb,94,9e,0b,2c,42,25,ea)
2321
#define GPT_USR_LOONGARCH64 SD_ID128_MAKE(e6,11,c7,02,57,5c,4c,be,9a,46,43,4f,a0,bf,7e,3f)
2422
#define GPT_USR_RISCV32 SD_ID128_MAKE(b9,33,fb,22,5c,3f,4f,91,af,90,e2,bb,0f,a5,07,02)
2523
#define GPT_USR_RISCV64 SD_ID128_MAKE(be,ae,c3,4b,84,42,43,9b,a4,0b,98,43,81,ed,09,7d)
24+
#define GPT_USR_X86 SD_ID128_MAKE(75,25,0d,76,8c,c6,45,8e,bd,66,bd,47,cc,81,a8,12)
25+
#define GPT_USR_X86_64 SD_ID128_MAKE(84,84,68,0c,95,21,48,c6,9c,11,b0,72,06,56,f6,9e)
2626
#define GPT_ESP SD_ID128_MAKE(c1,2a,73,28,f8,1f,11,d2,ba,4b,00,a0,c9,3e,c9,3b)
2727
#define GPT_XBOOTLDR SD_ID128_MAKE(bc,13,c2,ff,59,e6,42,62,a3,52,b2,75,fd,6f,71,72)
2828
#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 @@
3535

3636
/* Verity partitions for the root partitions above (we only define them for the root and /usr partitions,
3737
* because only they are commonly read-only and hence suitable for verity). */
38-
#define GPT_ROOT_X86_VERITY SD_ID128_MAKE(d1,3c,5d,3b,b5,d1,42,2a,b2,9f,94,54,fd,c8,9d,76)
39-
#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)
4038
#define GPT_ROOT_ARM_VERITY SD_ID128_MAKE(73,86,cd,f2,20,3c,47,a9,a4,98,f2,ec,ce,45,a2,d6)
4139
#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)
4240
#define GPT_ROOT_IA64_VERITY SD_ID128_MAKE(86,ed,10,d5,b6,07,45,bb,89,57,d3,50,f2,3d,05,71)
4341
#define GPT_ROOT_LOONGARCH64_VERITY SD_ID128_MAKE(f3,39,3b,22,e9,af,46,13,a9,48,9d,3b,fb,d0,c5,35)
4442
#define GPT_ROOT_RISCV32_VERITY SD_ID128_MAKE(ae,02,53,be,11,67,40,07,ac,68,43,92,6c,14,c5,de)
4543
#define GPT_ROOT_RISCV64_VERITY SD_ID128_MAKE(b6,ed,55,82,44,0b,42,09,b8,da,5f,f7,c4,19,ea,3d)
46-
#define GPT_USR_X86_VERITY SD_ID128_MAKE(8f,46,1b,0d,14,ee,4e,81,9a,a9,04,9b,6f,b9,7a,bd)
47-
#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)
44+
#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)
45+
#define GPT_ROOT_X86_VERITY SD_ID128_MAKE(d1,3c,5d,3b,b5,d1,42,2a,b2,9f,94,54,fd,c8,9d,76)
4846
#define GPT_USR_ARM_VERITY SD_ID128_MAKE(c2,15,d7,51,7b,cd,46,49,be,90,66,27,49,0a,4c,05)
4947
#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)
5048
#define GPT_USR_IA64_VERITY SD_ID128_MAKE(6a,49,1e,03,3b,e7,45,45,8e,38,83,32,0e,0e,a8,80)
5149
#define GPT_USR_LOONGARCH64_VERITY SD_ID128_MAKE(f4,6b,2c,26,59,ae,48,f0,91,06,c5,0e,d4,7f,67,3d)
5250
#define GPT_USR_RISCV32_VERITY SD_ID128_MAKE(cb,1e,e4,e3,8c,d0,41,36,a0,a4,aa,61,a3,2e,87,30)
5351
#define GPT_USR_RISCV64_VERITY SD_ID128_MAKE(8f,10,56,be,9b,05,47,c4,81,d6,be,53,12,8e,5b,54)
52+
#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)
53+
#define GPT_USR_X86_VERITY SD_ID128_MAKE(8f,46,1b,0d,14,ee,4e,81,9a,a9,04,9b,6f,b9,7a,bd)
5454

5555
/* PKCS#7 Signatures for the Verity Root Hashes */
56-
#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)
57-
#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)
5856
#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)
5957
#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)
6058
#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)
6159
#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)
6260
#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)
6361
#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)
64-
#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)
65-
#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)
62+
#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)
63+
#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)
6664
#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)
6765
#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)
6866
#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)
6967
#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)
7068
#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)
7169
#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)
70+
#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)
71+
#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)
7272

73-
#if defined(__x86_64__)
74-
# define GPT_ROOT_NATIVE GPT_ROOT_X86_64
75-
# define GPT_ROOT_SECONDARY GPT_ROOT_X86
76-
# define GPT_ROOT_NATIVE_VERITY GPT_ROOT_X86_64_VERITY
77-
# define GPT_ROOT_SECONDARY_VERITY GPT_ROOT_X86_VERITY
78-
# define GPT_ROOT_NATIVE_VERITY_SIG GPT_ROOT_X86_64_VERITY_SIG
79-
# define GPT_ROOT_SECONDARY_VERITY_SIG GPT_ROOT_X86_VERITY_SIG
80-
# define GPT_USR_NATIVE GPT_USR_X86_64
81-
# define GPT_USR_SECONDARY GPT_USR_X86
82-
# define GPT_USR_NATIVE_VERITY GPT_USR_X86_64_VERITY
83-
# define GPT_USR_SECONDARY_VERITY GPT_USR_X86_VERITY
84-
# define GPT_USR_NATIVE_VERITY_SIG GPT_USR_X86_64_VERITY_SIG
85-
# define GPT_USR_SECONDARY_VERITY_SIG GPT_USR_X86_VERITY_SIG
86-
#elif defined(__i386__)
87-
# define GPT_ROOT_NATIVE GPT_ROOT_X86
88-
# define GPT_ROOT_NATIVE_VERITY GPT_ROOT_X86_VERITY
89-
# define GPT_ROOT_NATIVE_VERITY_SIG GPT_ROOT_X86_VERITY_SIG
90-
# define GPT_USR_NATIVE GPT_USR_X86
91-
# define GPT_USR_NATIVE_VERITY GPT_USR_X86_VERITY
92-
# define GPT_USR_NATIVE_VERITY_SIG GPT_USR_X86_VERITY_SIG
93-
#endif
94-
95-
#if defined(__ia64__)
96-
# define GPT_ROOT_NATIVE GPT_ROOT_IA64
97-
# define GPT_ROOT_NATIVE_VERITY GPT_ROOT_IA64_VERITY
98-
# define GPT_ROOT_NATIVE_VERITY_SIG GPT_ROOT_IA64_VERITY_SIG
99-
# define GPT_USR_NATIVE GPT_USR_IA64
100-
# define GPT_USR_NATIVE_VERITY GPT_USR_IA64_VERITY
101-
# define GPT_USR_NATIVE_VERITY_SIG GPT_USR_IA64_VERITY_SIG
102-
#endif
103-
104-
#if defined(__aarch64__) && (__BYTE_ORDER != __BIG_ENDIAN)
73+
/* Maintain same order as above */
74+
#if defined(__aarch64__) && __BYTE_ORDER != __BIG_ENDIAN
10575
# define GPT_ROOT_NATIVE GPT_ROOT_ARM_64
10676
# define GPT_ROOT_SECONDARY GPT_ROOT_ARM
10777
# define GPT_ROOT_NATIVE_VERITY GPT_ROOT_ARM_64_VERITY
@@ -114,40 +84,65 @@
11484
# define GPT_USR_SECONDARY_VERITY GPT_USR_ARM_VERITY
11585
# define GPT_USR_NATIVE_VERITY_SIG GPT_USR_ARM_64_VERITY_SIG
11686
# define GPT_USR_SECONDARY_VERITY_SIG GPT_USR_ARM_VERITY_SIG
117-
#elif defined(__arm__) && (__BYTE_ORDER != __BIG_ENDIAN)
87+
#elif defined(__arm__) && __BYTE_ORDER != __BIG_ENDIAN
11888
# define GPT_ROOT_NATIVE GPT_ROOT_ARM
11989
# define GPT_ROOT_NATIVE_VERITY GPT_ROOT_ARM_VERITY
12090
# define GPT_ROOT_NATIVE_VERITY_SIG GPT_ROOT_ARM_VERITY_SIG
12191
# define GPT_USR_NATIVE GPT_USR_ARM
12292
# define GPT_USR_NATIVE_VERITY GPT_USR_ARM_VERITY
12393
# define GPT_USR_NATIVE_VERITY_SIG GPT_USR_ARM_VERITY_SIG
124-
#endif
12594

126-
#if defined(__loongarch64)
95+
#elif defined(__ia64__)
96+
# define GPT_ROOT_NATIVE GPT_ROOT_IA64
97+
# define GPT_ROOT_NATIVE_VERITY GPT_ROOT_IA64_VERITY
98+
# define GPT_ROOT_NATIVE_VERITY_SIG GPT_ROOT_IA64_VERITY_SIG
99+
# define GPT_USR_NATIVE GPT_USR_IA64
100+
# define GPT_USR_NATIVE_VERITY GPT_USR_IA64_VERITY
101+
# define GPT_USR_NATIVE_VERITY_SIG GPT_USR_IA64_VERITY_SIG
102+
103+
#elif defined(__loongarch64)
127104
# define GPT_ROOT_NATIVE GPT_ROOT_LOONGARCH64
128105
# define GPT_ROOT_NATIVE_VERITY GPT_ROOT_LOONGARCH64_VERITY
129106
# define GPT_ROOT_NATIVE_VERITY_SIG GPT_ROOT_LOONGARCH64_VERITY_SIG
130107
# define GPT_USR_NATIVE GPT_USR_LOONGARCH64
131108
# define GPT_USR_NATIVE_VERITY GPT_USR_LOONGARCH64_VERITY
132109
# define GPT_USR_NATIVE_VERITY_SIG GPT_USR_LOONGARCH64_VERITY_SIG
133-
#endif
134110

135-
#if defined(__riscv)
136-
#if (__riscv_xlen == 32)
111+
#elif defined(__riscv) && __riscv_xlen == 32
137112
# define GPT_ROOT_NATIVE GPT_ROOT_RISCV32
138113
# define GPT_ROOT_NATIVE_VERITY GPT_ROOT_RISCV32_VERITY
139114
# define GPT_ROOT_NATIVE_VERITY_SIG GPT_ROOT_RISCV32_VERITY_SIG
140115
# define GPT_USR_NATIVE GPT_USR_RISCV32
141116
# define GPT_USR_NATIVE_VERITY GPT_USR_RISCV32_VERITY
142117
# define GPT_USR_NATIVE_VERITY_SIG GPT_USR_RISCV32_VERITY_SIG
143-
#elif (__riscv_xlen == 64)
118+
#elif defined(__riscv) && __riscv_xlen == 64
144119
# define GPT_ROOT_NATIVE GPT_ROOT_RISCV64
145120
# define GPT_ROOT_NATIVE_VERITY GPT_ROOT_RISCV64_VERITY
146121
# define GPT_ROOT_NATIVE_VERITY_SIG GPT_ROOT_RISCV64_VERITY_SIG
147122
# define GPT_USR_NATIVE GPT_USR_RISCV64
148123
# define GPT_USR_NATIVE_VERITY GPT_USR_RISCV64_VERITY
149124
# define GPT_USR_NATIVE_VERITY_SIG GPT_USR_RISCV64_VERITY_SIG
150-
#endif
125+
126+
#elif defined(__x86_64__)
127+
# define GPT_ROOT_NATIVE GPT_ROOT_X86_64
128+
# define GPT_ROOT_SECONDARY GPT_ROOT_X86
129+
# define GPT_ROOT_NATIVE_VERITY GPT_ROOT_X86_64_VERITY
130+
# define GPT_ROOT_SECONDARY_VERITY GPT_ROOT_X86_VERITY
131+
# define GPT_ROOT_NATIVE_VERITY_SIG GPT_ROOT_X86_64_VERITY_SIG
132+
# define GPT_ROOT_SECONDARY_VERITY_SIG GPT_ROOT_X86_VERITY_SIG
133+
# define GPT_USR_NATIVE GPT_USR_X86_64
134+
# define GPT_USR_SECONDARY GPT_USR_X86
135+
# define GPT_USR_NATIVE_VERITY GPT_USR_X86_64_VERITY
136+
# define GPT_USR_SECONDARY_VERITY GPT_USR_X86_VERITY
137+
# define GPT_USR_NATIVE_VERITY_SIG GPT_USR_X86_64_VERITY_SIG
138+
# define GPT_USR_SECONDARY_VERITY_SIG GPT_USR_X86_VERITY_SIG
139+
#elif defined(__i386__)
140+
# define GPT_ROOT_NATIVE GPT_ROOT_X86
141+
# define GPT_ROOT_NATIVE_VERITY GPT_ROOT_X86_VERITY
142+
# define GPT_ROOT_NATIVE_VERITY_SIG GPT_ROOT_X86_VERITY_SIG
143+
# define GPT_USR_NATIVE GPT_USR_X86
144+
# define GPT_USR_NATIVE_VERITY GPT_USR_X86_VERITY
145+
# define GPT_USR_NATIVE_VERITY_SIG GPT_USR_X86_VERITY_SIG
151146
#endif
152147

153148
#define GPT_FLAG_REQUIRED_PARTITION (1ULL << 0)

0 commit comments

Comments
 (0)