|
 |
28f7f8 |
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
|
|
|
28f7f8 |
From: Peter Jones <pjones@redhat.com>
|
|
|
28f7f8 |
Date: Thu, 10 May 2018 13:40:19 -0400
|
|
|
28f7f8 |
Subject: [PATCH] Fixup for newer compiler
|
|
|
28f7f8 |
|
|
|
28f7f8 |
---
|
|
|
28f7f8 |
grub-core/fs/btrfs.c | 2 +-
|
|
|
28f7f8 |
include/grub/gpt_partition.h | 2 +-
|
|
|
28f7f8 |
conf/Makefile.common | 2 +-
|
|
|
28f7f8 |
3 files changed, 3 insertions(+), 3 deletions(-)
|
|
|
28f7f8 |
|
|
|
28f7f8 |
diff --git a/grub-core/fs/btrfs.c b/grub-core/fs/btrfs.c
|
|
|
28f7f8 |
index f7b6c152037..4a6efffeb46 100644
|
|
|
28f7f8 |
--- a/grub-core/fs/btrfs.c
|
|
|
28f7f8 |
+++ b/grub-core/fs/btrfs.c
|
|
|
28f7f8 |
@@ -183,7 +183,7 @@ struct grub_btrfs_inode
|
|
|
28f7f8 |
grub_uint64_t size;
|
|
|
28f7f8 |
grub_uint8_t dummy2[0x70];
|
|
|
28f7f8 |
struct grub_btrfs_time mtime;
|
|
|
28f7f8 |
-} GRUB_PACKED;
|
|
|
28f7f8 |
+} GRUB_PACKED __attribute__ ((aligned(8)));
|
|
|
28f7f8 |
|
|
|
28f7f8 |
struct grub_btrfs_extent_data
|
|
|
28f7f8 |
{
|
|
|
28f7f8 |
diff --git a/include/grub/gpt_partition.h b/include/grub/gpt_partition.h
|
|
|
28f7f8 |
index 1b32f6725a4..8cddf997efc 100644
|
|
|
28f7f8 |
--- a/include/grub/gpt_partition.h
|
|
|
28f7f8 |
+++ b/include/grub/gpt_partition.h
|
|
|
28f7f8 |
@@ -76,7 +76,7 @@ struct grub_gpt_partentry
|
|
|
28f7f8 |
grub_uint64_t end;
|
|
|
28f7f8 |
grub_uint64_t attrib;
|
|
|
28f7f8 |
char name[72];
|
|
|
28f7f8 |
-} GRUB_PACKED;
|
|
|
28f7f8 |
+} GRUB_PACKED __attribute__ ((aligned(8)));
|
|
|
28f7f8 |
|
|
|
28f7f8 |
grub_err_t
|
|
|
28f7f8 |
grub_gpt_partition_map_iterate (grub_disk_t disk,
|
|
|
28f7f8 |
diff --git a/conf/Makefile.common b/conf/Makefile.common
|
|
|
28f7f8 |
index 6f836d82771..9e0e8364f38 100644
|
|
|
28f7f8 |
--- a/conf/Makefile.common
|
|
|
28f7f8 |
+++ b/conf/Makefile.common
|
|
|
28f7f8 |
@@ -45,7 +45,7 @@ CFLAGS_KERNEL = $(CFLAGS_CPU) $(CFLAGS_PLATFORM) -ffreestanding
|
|
|
28f7f8 |
LDFLAGS_KERNEL = $(LDFLAGS_CPU) $(LDFLAGS_PLATFORM) -nostdlib $(TARGET_LDFLAGS_OLDMAGIC) $(TARGET_LDFLAGS_STATIC_LIBGCC)
|
|
|
28f7f8 |
CPPFLAGS_KERNEL = $(CPPFLAGS_CPU) $(CPPFLAGS_PLATFORM) -DGRUB_KERNEL=1
|
|
|
28f7f8 |
CCASFLAGS_KERNEL = $(CCASFLAGS_CPU) $(CCASFLAGS_PLATFORM)
|
|
|
28f7f8 |
-STRIPFLAGS_KERNEL = -R .eh_frame -R .rel.dyn -R .reginfo -R .note -R .comment -R .drectve -R .note.gnu.gold-version
|
|
|
28f7f8 |
+STRIPFLAGS_KERNEL = -R .eh_frame -R .rel.dyn -R .reginfo -R .note -R .comment -R .drectve -R .note.gnu.gold-version -R .MIPS.abiflags -R .ARM.exidx -R .note.gnu.property -R .gnu.build.attributes
|
|
|
28f7f8 |
|
|
|
28f7f8 |
CFLAGS_MODULE = $(CFLAGS_CPU) $(CFLAGS_PLATFORM) -ffreestanding
|
|
|
28f7f8 |
LDFLAGS_MODULE = $(LDFLAGS_CPU) $(LDFLAGS_PLATFORM) -nostdlib $(TARGET_LDFLAGS_OLDMAGIC) -Wl,-r,-d
|