slackware-current/source/a/grub/0198-align-struct-efi_variable-better.patch
Patrick J Volkerding 63f56cc135 Wed Jun 27 04:13:25 UTC 2018
a/kernel-generic-4.14.52-x86_64-1.txz:  Upgraded.
a/kernel-huge-4.14.52-x86_64-1.txz:  Upgraded.
a/kernel-modules-4.14.52-x86_64-1.txz:  Upgraded.
ap/sox-14.4.2-x86_64-6.txz:  Rebuilt.
  Rebuilt to drop libssp dependency. We're no longer building that with gcc
  since glibc already includes a built-in SSP implementation.
d/gcc-8.1.1-x86_64-1.txz:  Upgraded.
  Shared library .so-version bump.
  This is taken from the gcc-8-branch of the svn repo on 20180626, revision
  r262159. All packages have been tested for build failures and all new FTBFS
  issues are fixed - I think we're down to the six possibly obsolete X drivers
  (geode, r128, s3virge, savage, sis, and tseng) and virtuoso-ose.
d/gcc-brig-8.1.1-x86_64-1.txz:  Upgraded.
d/gcc-g++-8.1.1-x86_64-1.txz:  Upgraded.
d/gcc-gfortran-8.1.1-x86_64-1.txz:  Upgraded.
  Shared library .so-version bump.
d/gcc-gnat-8.1.1-x86_64-1.txz:  Upgraded.
d/gcc-go-8.1.1-x86_64-1.txz:  Upgraded.
  Shared library .so-version bump.
d/gcc-objc-8.1.1-x86_64-1.txz:  Upgraded.
d/kernel-headers-4.14.52-x86-1.txz:  Upgraded.
d/libtool-2.4.6-x86_64-8.txz:  Rebuilt.
  Recompiled to update embedded GCC version number.
k/kernel-source-4.14.52-noarch-1.txz:  Upgraded.
l/db48-4.8.30-x86_64-4.txz:  Rebuilt.
  Patched to fix a symbol collision with gcc8.
n/netatalk-3.1.11-x86_64-1.txz:  Upgraded.
  Thanks to Matthew Schumacher for updating the build script and providing
  some useful config file examples.
extra/pure-alsa-system/sox-14.4.2-x86_64-6_alsa.txz:  Rebuilt.
isolinux/initrd.img:  Rebuilt.
kernels/*:  Upgraded.
usb-and-pxe-installers/usbboot.img:  Rebuilt.
2018-06-27 21:00:55 +02:00

36 lines
1.1 KiB
Diff

From 2485633ada06c11c07a34a696a92b14e58f1e846 Mon Sep 17 00:00:00 2001
From: Peter Jones <pjones@redhat.com>
Date: Tue, 27 Feb 2018 13:55:35 -0500
Subject: [PATCH 198/250] align struct efi_variable better...
---
include/grub/efiemu/runtime.h | 2 +-
include/grub/types.h | 1 +
2 files changed, 2 insertions(+), 1 deletion(-)
diff --git a/include/grub/efiemu/runtime.h b/include/grub/efiemu/runtime.h
index 9b6b729f4cc..856774a7c34 100644
--- a/include/grub/efiemu/runtime.h
+++ b/include/grub/efiemu/runtime.h
@@ -33,5 +33,5 @@ struct efi_variable
grub_uint32_t namelen;
grub_uint32_t size;
grub_efi_uint32_t attributes;
-} GRUB_PACKED;
+} GRUB_PACKED GRUB_ALIGNED(8);
#endif /* ! GRUB_EFI_EMU_RUNTIME_HEADER */
diff --git a/include/grub/types.h b/include/grub/types.h
index b93e4820194..f6a9723971d 100644
--- a/include/grub/types.h
+++ b/include/grub/types.h
@@ -29,6 +29,7 @@
#else
#define GRUB_PACKED __attribute__ ((packed))
#endif
+#define GRUB_ALIGNED(x) __attribute__((aligned (x)))
#ifdef GRUB_BUILD
# define GRUB_CPU_SIZEOF_VOID_P BUILD_SIZEOF_VOID_P
--
2.14.3