nalika / rpms / grub2

Forked from rpms/grub2 2 years ago
Clone

Blame SOURCES/0059-Don-t-attempt-to-backtrace-on-grub_abort-for-grub-em.patch

8e15ce
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
8e15ce
From: Javier Martinez Canillas <javierm@redhat.com>
8e15ce
Date: Tue, 6 Feb 2018 11:16:28 +0100
8e15ce
Subject: [PATCH] Don't attempt to backtrace on grub_abort() for grub-emu
8e15ce
8e15ce
The emu platform doesn't have a grub_backtrace() implementation, so this
8e15ce
causes a build error. Don't attempt to call this when building grub-emu.
8e15ce
8e15ce
Signed-off-by: Javier Martinez Canillas <javierm@redhat.com>
8e15ce
---
8e15ce
 grub-core/kern/misc.c | 2 +-
8e15ce
 1 file changed, 1 insertion(+), 1 deletion(-)
8e15ce
8e15ce
diff --git a/grub-core/kern/misc.c b/grub-core/kern/misc.c
b35c50
index a3e215155b..c60601b699 100644
8e15ce
--- a/grub-core/kern/misc.c
8e15ce
+++ b/grub-core/kern/misc.c
8e15ce
@@ -1201,7 +1201,7 @@ static void __attribute__ ((noreturn))
8e15ce
 grub_abort (void)
8e15ce
 {
8e15ce
 #ifndef GRUB_UTIL
8e15ce
-#if defined(__i386__) || defined(__x86_64__)
8e15ce
+#if (defined(__i386__) || defined(__x86_64__)) && !defined(GRUB_MACHINE_EMU)
8e15ce
   grub_backtrace();
8e15ce
 #endif
8e15ce
 #endif