From 01fcf061eadf54a618452be258d4896431c8bba7 Mon Sep 17 00:00:00 2001
From: Vladimir 'phcoder' Serbinenko <phcoder@gmail.com>
Date: Sun, 11 Apr 2010 16:14:51 +0200
Subject: [PATCH] 	* configure.ac: Respect grub_cv_asm_uscore when
 defining dummy symbols.

---
 ChangeLog    |  4 ++++
 configure.ac | 10 ++++++++--
 2 files changed, 12 insertions(+), 2 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index ec4766d44..61f1bc20e 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+2010-04-11  Vladimir Serbinenko  <phcoder@gmail.com>
+
+	* configure.ac: Respect grub_cv_asm_uscore when defining dummy symbols.
+
 2010-04-11  Vladimir Serbinenko  <phcoder@gmail.com>
 
 	Unify libgcc processing.
diff --git a/configure.ac b/configure.ac
index afdb7b32d..66e06bc86 100644
--- a/configure.ac
+++ b/configure.ac
@@ -479,12 +479,19 @@ CC="$TARGET_CC"
 if test "x$TARGET_APPLE_CC" = x1 ; then
 CFLAGS="$TARGET_CFLAGS -nostdlib -Wno-error"
 else
-CFLAGS="$TARGET_CFLAGS -nostdlib -Wl,--defsym,___main=0x8100 -Wl,--defsym,abort=main -Wno-error"
+CFLAGS="$TARGET_CFLAGS -nostdlib -Wl,--defsym,___main=0x8100 -Wno-error"
 fi
 CPPFLAGS="$TARGET_CPPFLAGS"
 LDFLAGS="$TARGET_LDFLAGS"
 LIBS=-lgcc
 
+grub_ASM_USCORE
+if test x$grub_cv_asm_uscore = xyes; then
+CFLAGS="$CFLAGS -Wl,--defsym,_abort=_main"
+else
+CFLAGS="$CFLAGS -Wl,--defsym,abort=main"
+fi
+
 # Check for libgcc symbols
 AC_CHECK_FUNCS(__bswapsi2 __bswapdi2 __ashldi3 __ashrdi3 __lshrdi3 __trampoline_setup __ucmpdi2 _restgpr_14_x)
 
@@ -501,7 +508,6 @@ if test "x$TARGET_APPLE_CC" != x1 ; then
 grub_PROG_OBJCOPY_ABSOLUTE
 fi
 grub_PROG_LD_BUILD_ID_NONE
-grub_ASM_USCORE
 if test "x$target_cpu" = xi386; then
   if test ! -z "$TARGET_IMG_LDSCRIPT"; then
     # Check symbols provided by linker script.