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 f44ecc714b19af7f4a24b22d871aac0f5ed4ce17..8d117a5c4d5a973177792ae170620f24da687434 100644 (file)
--- 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 6f9baf18f72c2322ff19ec4a1174cdd67caa9c9c..36a3b3e0829afb0f1500d73ca870154dce6ee388 100644 (file)
--- 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],