* acinclude.m4 (grub_ASM_USCORE): Use a more accurate grep pattern,
to avoid false positives with some assemblers that output things like "someprefix_func" as part of their output.
This commit is contained in:
parent
729a0f2e0c
commit
9da94e0576
2 changed files with 8 additions and 1 deletions
|
@ -1,3 +1,9 @@
|
||||||
|
2010-08-18 Colin Watson <cjwatson@ubuntu.com>
|
||||||
|
|
||||||
|
* acinclude.m4 (grub_ASM_USCORE): Use a more accurate grep pattern,
|
||||||
|
to avoid false positives with some assemblers that output things
|
||||||
|
like "someprefix_func" as part of their output.
|
||||||
|
|
||||||
2010-08-15 Robert Millan <rmh@gnu.org>
|
2010-08-15 Robert Millan <rmh@gnu.org>
|
||||||
|
|
||||||
* kern/emu/misc.c (grub_get_libzfs_handle): Handle libzfs_init()
|
* kern/emu/misc.c (grub_get_libzfs_handle): Handle libzfs_init()
|
||||||
|
|
|
@ -38,6 +38,7 @@ dnl Written by Pavel Roskin. Based on grub_ASM_EXT_C written by
|
||||||
dnl Erich Boleyn and modified by Yoshinori K. Okuji.
|
dnl Erich Boleyn and modified by Yoshinori K. Okuji.
|
||||||
AC_DEFUN([grub_ASM_USCORE],
|
AC_DEFUN([grub_ASM_USCORE],
|
||||||
[AC_REQUIRE([AC_PROG_CC])
|
[AC_REQUIRE([AC_PROG_CC])
|
||||||
|
AC_REQUIRE([AC_PROG_EGREP])
|
||||||
AC_MSG_CHECKING([if C symbols get an underscore after compilation])
|
AC_MSG_CHECKING([if C symbols get an underscore after compilation])
|
||||||
AC_CACHE_VAL(grub_cv_asm_uscore,
|
AC_CACHE_VAL(grub_cv_asm_uscore,
|
||||||
[cat > conftest.c <<\EOF
|
[cat > conftest.c <<\EOF
|
||||||
|
@ -56,7 +57,7 @@ else
|
||||||
AC_MSG_ERROR([${CC-cc} failed to produce assembly code])
|
AC_MSG_ERROR([${CC-cc} failed to produce assembly code])
|
||||||
fi
|
fi
|
||||||
|
|
||||||
if grep _func conftest.s >/dev/null 2>&1; then
|
if $EGREP '(^|[^_[:alnum]])_func' conftest.s >/dev/null 2>&1; then
|
||||||
grub_cv_asm_uscore=yes
|
grub_cv_asm_uscore=yes
|
||||||
else
|
else
|
||||||
grub_cv_asm_uscore=no
|
grub_cv_asm_uscore=no
|
||||||
|
|
Loading…
Reference in a new issue