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

	Reported by: echoline.

diff --git a/ChangeLog b/ChangeLog
index 5c64e02078828cd057d8931313bce9ea06ede4b6..dcd16e8e9498f0dc83a15a0329d5d37b94ea2259 100644 (file)
--- 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 69fdc3d42aadd04e36bc82d43b0e974b6b4fae54..0bfa08992ade28a043bfa57da80f04c11ff3f152 100644 (file)
--- 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