From: Vladimir 'phcoder' Serbinenko <phcoder@gmail.com>
Date: Sat, 4 Sep 2010 00:18:48 +0000 (+0200)
Subject: 	* grub-core/kern/misc.c: Don't add abort alias in utils.
X-Git-Tag: 1.99~602
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=dda060dd0fb1e0db8735e449908fbaaee91f4a75;p=thirdparty%2Fgrub.git

	* grub-core/kern/misc.c: Don't add abort alias in utils.
	Reported by: echoline.
---

diff --git a/ChangeLog b/ChangeLog
index 5c64e0207..dcd16e8e9 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2010-09-04  Vladimir Serbinenko  <phcoder@gmail.com>
+
+	* grub-core/kern/misc.c: Don't add abort alias in utils.
+	Reported by: echoline.
+
 2010-09-03  BVK Chaitanya  <bvk.groups@gmail.com>
 
 	Add missing files into "make dist" tarball for other platforms.
diff --git a/grub-core/kern/misc.c b/grub-core/kern/misc.c
index 69fdc3d42..0bfa08992 100644
--- a/grub-core/kern/misc.c
+++ b/grub-core/kern/misc.c
@@ -990,7 +990,7 @@ grub_abort (void)
   grub_exit ();
 }
 
-#ifndef APPLE_CC
+#if ! defined (APPLE_CC) && !defined (GRUB_UTIL)
 /* GCC emits references to abort().  */
 void abort (void) __attribute__ ((alias ("grub_abort")));
 #endif