nalika / rpms / grub2

Forked from rpms/grub2 2 years ago
Clone

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

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