vbatts/grub
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

Fix packed-not-aligned error on GCC 8

Browse source 
When building with GCC 8, there are several errors regarding packed-not-aligned.

./include/grub/gpt_partition.h:79:1: error: alignment 1 of ‘struct grub_gpt_partentry’ is less than 8 [-Werror=packed-not-aligned]

This patch fixes the build error by cleaning up the ambiguity of placing
aligned structure in a packed one. In "struct grub_btrfs_time" and "struct
grub_gpt_part_type", the aligned attribute seems to be superfluous, and also
has to be packed, to ensure the structure is bit-to-bit mapped to the format
laid on disk. I think we could blame to copy and paste error here for the
mistake. In "struct efi_variable", we have to use grub_efi_packed_guid_t, as
the name suggests. :)

Signed-off-by: Michael Chang <mchang@suse.com>
Tested-by: Michael Chang <mchang@suse.com>
Tested-by: Paul Menzel <paulepanter@users.sourceforge.net>
Reviewed-by: Daniel Kiper <daniel.kiper@oracle.com>
This commit is contained in:
Michael Chang 2018-03-26 16:52:34 +08:00 committed by Daniel Kiper
parent a537d65018
commit 563b1da6e6
3 changed files with 3 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
grub-core/fs/btrfs.c
View file

@ -175,7 +175,7 @@ struct grub_btrfs_time
{ {
grub_int64_t sec; grub_int64_t sec;
grub_uint32_t nanosec; grub_uint32_t nanosec;
} __attribute__ ((aligned (4))); } GRUB_PACKED;
struct grub_btrfs_inode struct grub_btrfs_inode
{ {

2
include/grub/efiemu/runtime.h
View file

@ -29,7 +29,7 @@ struct grub_efiemu_ptv_rel
struct efi_variable struct efi_variable
{ {
grub_efi_guid_t guid; grub_efi_packed_guid_t guid;
grub_uint32_t namelen; grub_uint32_t namelen;
grub_uint32_t size; grub_uint32_t size;
grub_efi_uint32_t attributes; grub_efi_uint32_t attributes;

2
include/grub/gpt_partition.h
View file

@ -28,7 +28,7 @@ struct grub_gpt_part_type
grub_uint16_t data2; grub_uint16_t data2;
grub_uint16_t data3; grub_uint16_t data3;
grub_uint8_t data4[8]; grub_uint8_t data4[8];
} __attribute__ ((aligned(8))); } GRUB_PACKED;
typedef struct grub_gpt_part_type grub_gpt_part_type_t; typedef struct grub_gpt_part_type grub_gpt_part_type_t;
#define GRUB_GPT_PARTITION_TYPE_EMPTY \ #define GRUB_GPT_PARTITION_TYPE_EMPTY \