Fix alignment of some data structures

ani-sinha · ani-sinha · commit 80547f65256b · 2022-06-02T22:16:31.000+05:30
This fixes the alignment of some data strructures by making them aligned to
eight byte boundaries. This resolves gcc complaints like the following:

error: alignment 1 of 'struct grub_btrfs_inode' is less than 8 [-Werror=packed-not-aligned]

Signed-off-by: Ani Sinha &lt;ani@anisinha.ca&gt;
diff --git a/grub-core/fs/btrfs.c b/grub-core/fs/btrfs.c
@@ -200,7 +200,7 @@ struct grub_btrfs_time
 {
   grub_int64_t sec;
   grub_uint32_t nanosec;
-} __attribute__ ((aligned (4)));
+} __attribute__ ((packed));
 
 struct grub_btrfs_inode
 {
diff --git a/include/grub/acpi.h b/include/grub/acpi.h
@@ -84,7 +84,7 @@ struct grub_acpi_madt
   grub_uint32_t lapic_addr;
   grub_uint32_t flags;
   struct grub_acpi_madt_entry_header entries[0];
-};
+} __attribute__ ((packed));
 
 enum
   {
diff --git a/include/grub/gpt_partition.h b/include/grub/gpt_partition.h
@@ -28,7 +28,7 @@ struct grub_gpt_part_type
   grub_uint16_t data2;
   grub_uint16_t data3;
   grub_uint8_t data4[8];
-} __attribute__ ((aligned(8)));
+} __attribute__ ((packed));
 typedef struct grub_gpt_part_type grub_gpt_part_type_t;
 
 #define GRUB_GPT_PARTITION_TYPE_EMPTY \

Original file line number	Diff line number	Diff line change
`@@ -200,7 +200,7 @@ struct grub_btrfs_time`
`200`	`200`	`{`
`201`	`201`	`grub_int64_t sec;`
`202`	`202`	`grub_uint32_t nanosec;`
`203`		`-} __attribute__ ((aligned (4)));`
	`203`	`+} __attribute__ ((packed));`
`204`	`204`
`205`	`205`	`struct grub_btrfs_inode`
`206`	`206`	`{`
Original file line number	Diff line number	Diff line change
`@@ -84,7 +84,7 @@ struct grub_acpi_madt`
`84`	`84`	`grub_uint32_t lapic_addr;`
`85`	`85`	`grub_uint32_t flags;`
`86`	`86`	`struct grub_acpi_madt_entry_header entries[0];`
`87`		`-};`
	`87`	`+} __attribute__ ((packed));`
`88`	`88`
`89`	`89`	`enum`
`90`	`90`	`{`