nalika / rpms / grub2

Forked from rpms/grub2 2 years ago
Clone

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

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