You can not select more than 25 topics
Topics must start with a letter or number, can include dashes ('-') and can be up to 35 characters long.
51 lines
2.1 KiB
51 lines
2.1 KiB
4 years ago
|
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
|
||
|
|
From: Peter Jones <pjones@redhat.com>
|
||
|
|
Date: Thu, 10 May 2018 13:40:19 -0400
|
||
|
|
Subject: [PATCH] Fixup for newer compiler
|
||
|
|
|
||
|
|
---
|
||
|
|
grub-core/fs/btrfs.c | 2 +-
|
||
|
|
include/grub/gpt_partition.h | 2 +-
|
||
|
|
conf/Makefile.common | 2 +-
|
||
|
|
3 files changed, 3 insertions(+), 3 deletions(-)
|
||
|
|
|
||
|
|
diff --git a/grub-core/fs/btrfs.c b/grub-core/fs/btrfs.c
|
||
|
|
index f7b6c152037..4a6efffeb46 100644
|
||
|
|
--- a/grub-core/fs/btrfs.c
|
||
|
|
+++ b/grub-core/fs/btrfs.c
|
||
|
|
@@ -183,7 +183,7 @@ struct grub_btrfs_inode
|
||
|
|
grub_uint64_t size;
|
||
|
|
grub_uint8_t dummy2[0x70];
|
||
|
|
struct grub_btrfs_time mtime;
|
||
|
|
-} GRUB_PACKED;
|
||
|
|
+} GRUB_PACKED __attribute__ ((aligned(8)));
|
||
|
|
|
||
|
|
struct grub_btrfs_extent_data
|
||
|
|
{
|
||
|
|
diff --git a/include/grub/gpt_partition.h b/include/grub/gpt_partition.h
|
||
|
|
index 1b32f6725a4..8cddf997efc 100644
|
||
|
|
--- a/include/grub/gpt_partition.h
|
||
|
|
+++ b/include/grub/gpt_partition.h
|
||
|
|
@@ -76,7 +76,7 @@ struct grub_gpt_partentry
|
||
|
|
grub_uint64_t end;
|
||
|
|
grub_uint64_t attrib;
|
||
|
|
char name[72];
|
||
|
|
-} GRUB_PACKED;
|
||
|
|
+} GRUB_PACKED __attribute__ ((aligned(8)));
|
||
|
|
|
||
|
|
grub_err_t
|
||
|
|
grub_gpt_partition_map_iterate (grub_disk_t disk,
|
||
|
|
diff --git a/conf/Makefile.common b/conf/Makefile.common
|
||
|
|
index 6f836d82771..9e0e8364f38 100644
|
||
|
|
--- a/conf/Makefile.common
|
||
|
|
+++ b/conf/Makefile.common
|
||
|
|
@@ -45,7 +45,7 @@ CFLAGS_KERNEL = $(CFLAGS_CPU) $(CFLAGS_PLATFORM) -ffreestanding
|
||
|
|
LDFLAGS_KERNEL = $(LDFLAGS_CPU) $(LDFLAGS_PLATFORM) -nostdlib $(TARGET_LDFLAGS_OLDMAGIC) $(TARGET_LDFLAGS_STATIC_LIBGCC)
|
||
|
|
CPPFLAGS_KERNEL = $(CPPFLAGS_CPU) $(CPPFLAGS_PLATFORM) -DGRUB_KERNEL=1
|
||
|
|
CCASFLAGS_KERNEL = $(CCASFLAGS_CPU) $(CCASFLAGS_PLATFORM)
|
||
|
|
-STRIPFLAGS_KERNEL = -R .eh_frame -R .rel.dyn -R .reginfo -R .note -R .comment -R .drectve -R .note.gnu.gold-version
|
||
|
|
+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
|
||
|
|
|
||
|
|
CFLAGS_MODULE = $(CFLAGS_CPU) $(CFLAGS_PLATFORM) -ffreestanding
|
||
|
|
LDFLAGS_MODULE = $(LDFLAGS_CPU) $(LDFLAGS_PLATFORM) -nostdlib $(TARGET_LDFLAGS_OLDMAGIC) -Wl,-r,-d
|