mirror of
https://src.fedoraproject.org/rpms/grub2.git
synced 2024-11-24 22:35:28 +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>
49 lines
1.8 KiB
Diff
49 lines
1.8 KiB
Diff
From c7b270e4214ef01f84c56411b388162f40f15b59 Mon Sep 17 00:00:00 2001
|
|
From: Peter Jones <pjones@redhat.com>
|
|
Date: Thu, 1 Jun 2017 10:07:50 -0400
|
|
Subject: [PATCH 185/206] Add PRIxGRUB_EFI_STATUS and use it.
|
|
|
|
This avoids syntax checkers getting confused about if it's llx or lx.
|
|
|
|
Signed-off-by: Peter Jones <pjones@redhat.com>
|
|
---
|
|
grub-core/loader/efi/chainloader.c | 3 ++-
|
|
include/grub/efi/api.h | 8 ++++++++
|
|
2 files changed, 10 insertions(+), 1 deletion(-)
|
|
|
|
diff --git a/grub-core/loader/efi/chainloader.c b/grub-core/loader/efi/chainloader.c
|
|
index d2557b38dce..2c62faa2943 100644
|
|
--- a/grub-core/loader/efi/chainloader.c
|
|
+++ b/grub-core/loader/efi/chainloader.c
|
|
@@ -783,7 +783,8 @@ handle_image (void *data, grub_efi_uint32_t datasize)
|
|
efi_status = efi_call_2 (entry_point, grub_efi_image_handle,
|
|
grub_efi_system_table);
|
|
|
|
- grub_dprintf ("chain", "entry_point returned %ld\n", efi_status);
|
|
+ grub_dprintf ("chain", "entry_point returned 0x%"PRIxGRUB_EFI_STATUS"\n",
|
|
+ efi_status);
|
|
grub_memcpy (li, &li_bak, sizeof (grub_efi_loaded_image_t));
|
|
efi_status = grub_efi_free_pool (buffer);
|
|
|
|
diff --git a/include/grub/efi/api.h b/include/grub/efi/api.h
|
|
index 02488ec35ae..ddc5ecfb03d 100644
|
|
--- a/include/grub/efi/api.h
|
|
+++ b/include/grub/efi/api.h
|
|
@@ -527,6 +527,14 @@ typedef grub_uint8_t grub_efi_char8_t;
|
|
typedef grub_uint16_t grub_efi_char16_t;
|
|
|
|
typedef grub_efi_intn_t grub_efi_status_t;
|
|
+/* Make grub_efi_status_t reasonably printable. */
|
|
+#if GRUB_CPU_SIZEOF_VOID_P == 8
|
|
+#define PRIxGRUB_EFI_STATUS "lx"
|
|
+#define PRIdGRUB_EFI_STATUS "ld"
|
|
+#else
|
|
+#define PRIxGRUB_EFI_STATUS "llx"
|
|
+#define PRIdGRUB_EFI_STATUS "lld"
|
|
+#endif
|
|
|
|
#define GRUB_EFI_ERROR_CODE(value) \
|
|
((((grub_efi_status_t) 1) << (sizeof (grub_efi_status_t) * 8 - 1)) | (value))
|
|
--
|
|
2.15.0
|
|
|