mirror of
https://src.fedoraproject.org/rpms/grub2.git
synced 2024-11-28 15:46:53 +00:00
81987f4958
- Try to fix things for new compiler madness. I really don't know why gcc decided __attribute__((packed)) on a "typedef struct" should imply __attribute__((align (1))) and that it should have a warning that it does so. The obvious behavior would be to keep the alignment of the first element unless it's used in another object or type that /also/ hask the packed attribute. Why should it change the default alignment at all? - Merge in the BLS patches Javier and I wrote. - Attempt to fix pmtimer initialization failures to not be super duper slow. Signed-off-by: Peter Jones <pjones@redhat.com>
32 lines
1,005 B
Diff
32 lines
1,005 B
Diff
From cc0a1afb1d30df68168c48968fb13134d897d561 Mon Sep 17 00:00:00 2001
|
|
From: Peter Jones <pjones@redhat.com>
|
|
Date: Mon, 26 Jun 2017 12:46:23 -0400
|
|
Subject: [PATCH 189/206] make GRUB_MOD_INIT() declare its function prototypes.
|
|
|
|
---
|
|
include/grub/dl.h | 2 ++
|
|
1 file changed, 2 insertions(+)
|
|
|
|
diff --git a/include/grub/dl.h b/include/grub/dl.h
|
|
index 2bca56ce0e8..b1ed3c33317 100644
|
|
--- a/include/grub/dl.h
|
|
+++ b/include/grub/dl.h
|
|
@@ -54,6 +54,7 @@ grub_mod_fini (void)
|
|
|
|
#define GRUB_MOD_INIT(name) \
|
|
static void grub_mod_init (grub_dl_t mod __attribute__ ((unused))) __attribute__ ((used)); \
|
|
+extern void grub_##name##_init (void); \
|
|
void \
|
|
grub_##name##_init (void) { grub_mod_init (0); } \
|
|
static void \
|
|
@@ -61,6 +62,7 @@ grub_mod_init (grub_dl_t mod __attribute__ ((unused)))
|
|
|
|
#define GRUB_MOD_FINI(name) \
|
|
static void grub_mod_fini (void) __attribute__ ((used)); \
|
|
+extern void grub_##name##_fini (void); \
|
|
void \
|
|
grub_##name##_fini (void) { grub_mod_fini (); } \
|
|
static void \
|
|
--
|
|
2.15.0
|
|
|