diff --git a/ChangeLog b/ChangeLog
index 3d2e45764..0d1cc9dac 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2009-03-31  Pavel Roskin  <proski@gnu.org>
+
+	* aclocal.m4 (grub_I386_CHECK_REGPARM_BUG): Provide safe default
+	for cross-compilation.
+
 2009-03-30  Robert Millan  <rmh@aybabtu.com>
 
 	Fix i386-ieee1275 build.
diff --git a/aclocal.m4 b/aclocal.m4
index b54ef15db..afd135d8f 100644
--- a/aclocal.m4
+++ b/aclocal.m4
@@ -337,6 +337,7 @@ main (void)
 }
 ]])],
 	[grub_cv_i386_check_nested_functions=no],
+	[grub_cv_i386_check_nested_functions=yes],
 	[grub_cv_i386_check_nested_functions=yes])])
 
 AC_MSG_RESULT([$grub_cv_i386_check_nested_functions])
diff --git a/configure b/configure
index b717572bb..d1f476d44 100644
--- a/configure
+++ b/configure
@@ -8171,13 +8171,7 @@ if test "${grub_cv_i386_check_nested_functions+set}" = set; then
   $as_echo_n "(cached) " >&6
 else
   if test "$cross_compiling" = yes; then
-  { { $as_echo "$as_me:$LINENO: error: in \`$ac_pwd':" >&5
-$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
-{ { $as_echo "$as_me:$LINENO: error: cannot run test program while cross compiling
-See \`config.log' for more details." >&5
-$as_echo "$as_me: error: cannot run test program while cross compiling
-See \`config.log' for more details." >&2;}
-   { (exit 1); exit 1; }; }; }
+  grub_cv_i386_check_nested_functions=yes
 else
   cat >conftest.$ac_ext <<_ACEOF
 /* confdefs.h.  */
@@ -9708,9 +9702,9 @@ esac
 
 cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
 # Files that config.status was made for.
-config_files="`echo $ac_config_files`"
-config_headers="`echo $ac_config_headers`"
-config_links="`echo $ac_config_links`"
+config_files="$ac_config_files"
+config_headers="$ac_config_headers"
+config_links="$ac_config_links"
 
 _ACEOF