From: Robert Millan <rmh@aybabtu.com>
Date: Mon, 18 Jan 2010 16:22:03 +0000 (+0000)
Subject: 2010-01-18  Robert Millan  <rmh.grub@aybabtu.com>
X-Git-Tag: 1.98~167
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=b2cab848777f66daa9fab089575805639d9eb213;p=thirdparty%2Fgrub.git

2010-01-18  Robert Millan  <rmh.grub@aybabtu.com>

	* acinclude.m4: Remove `nop' assembly instruction; it's not
	implemented by all architectures.
---

diff --git a/ChangeLog b/ChangeLog
index f44ecc714..8d117a5c4 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2010-01-18  Robert Millan  <rmh.grub@aybabtu.com>
+
+	* acinclude.m4: Remove `nop' assembly instruction; it's not
+	implemented by all architectures.
+
 2010-01-18  Robert Millan  <rmh.grub@aybabtu.com>
 
 	* loader/i386/efi/linux.c (grub_cmd_linux): Stop pretending we're
diff --git a/acinclude.m4 b/acinclude.m4
index 6f9baf18f..36a3b3e08 100644
--- a/acinclude.m4
+++ b/acinclude.m4
@@ -18,7 +18,7 @@ AC_DEFUN(grub_PROG_TARGET_CC,
 [AC_MSG_CHECKING([whether target compiler is working])
 AC_CACHE_VAL(grub_cv_prog_target_cc,
 [AC_LINK_IFELSE([AC_LANG_PROGRAM([[
-asm (".globl start; start: nop");
+asm (".globl start; start:");
 int main (void);
 ]], [[]])],
   		[grub_cv_prog_target_cc=yes],