mirror of
https://src.fedoraproject.org/rpms/grub2.git
synced 2024-11-25 06:37:33 +00:00
31 lines
961 B
Diff
31 lines
961 B
Diff
|
From 6bebad4c7172ba23d3994828945b21ed74bcc6c2 Mon Sep 17 00:00:00 2001
|
||
|
|
From: Javier Martinez Canillas <javierm@redhat.com>
|
||
|
|
Date: Tue, 6 Feb 2018 11:16:28 +0100
|
||
|
|
Subject: [PATCH 204/206] Don't attempt to backtrace on grub_abort() for
|
||
|
|
grub-emu
|
||
|
|
|
||
|
|
The emu platform doesn't have a grub_backtrace() implementation, so this
|
||
|
|
causes a build error. Don't attempt to call this when building grub-emu.
|
||
|
|
|
||
|
|
Signed-off-by: Javier Martinez Canillas <javierm@redhat.com>
|
||
|
|
---
|
||
|
|
grub-core/kern/misc.c | 2 +-
|
||
|
|
1 file changed, 1 insertion(+), 1 deletion(-)
|
||
|
|
|
||
|
|
diff --git a/grub-core/kern/misc.c b/grub-core/kern/misc.c
|
||
|
|
index 04371ac49f2..636f97e1ba1 100644
|
||
|
|
--- a/grub-core/kern/misc.c
|
||
|
|
+++ b/grub-core/kern/misc.c
|
||
|
|
@@ -1103,7 +1103,7 @@ static void __attribute__ ((noreturn))
|
||
|
|
grub_abort (void)
|
||
|
|
{
|
||
|
|
#ifndef GRUB_UTIL
|
||
|
|
-#if defined(__i386__) || defined(__x86_64__)
|
||
|
|
+#if (defined(__i386__) || defined(__x86_64__)) && !defined(GRUB_MACHINE_EMU)
|
||
|
|
grub_backtrace();
|
||
|
|
#endif
|
||
|
|
#endif
|
||
|
|
--
|
||
|
|
2.15.0
|
||
|
|
|