vbatts/grub
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

Determine the need for mingw-related stubs at compile time rather than

Browse source 
using not very significant $target_os.
This commit is contained in:
Vladimir Serbinenko 2013-12-16 14:18:15 +01:00
parent fadddc260a
commit 252a289cb3
4 changed files with 16 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
ChangeLog
View file

@ -1,3 +1,8 @@
2013-12-16 Vladimir Serbinenko <phcoder@gmail.com>
Determine the need for mingw-related stubs at compile time rather than
using not very significant $target_os.
2013-12-16 Vladimir Serbinenko <phcoder@gmail.com> 2013-12-16 Vladimir Serbinenko <phcoder@gmail.com>
* grub-core/genmod.sh.in: Strip before converting to ELF as strip * grub-core/genmod.sh.in: Strip before converting to ELF as strip

10
configure.ac
View file

@ -693,16 +693,6 @@ if test "x$grub_cv_cc_fno_asynchronous_unwind_tables" = xyes; then
TARGET_CFLAGS="$TARGET_CFLAGS -fno-asynchronous-unwind-tables" TARGET_CFLAGS="$TARGET_CFLAGS -fno-asynchronous-unwind-tables"
fi fi
# For platforms where ELF is not the default link format.
case "${target_os}" in
cygwin)
# FIXME: put proper test here
NEED_REGISTER_FRAME_INFO=1
;;
*) NEED_REGISTER_FRAME_INFO=0 ;;
esac
AC_ARG_ENABLE([efiemu], AC_ARG_ENABLE([efiemu],
[AS_HELP_STRING([--enable-efiemu], [AS_HELP_STRING([--enable-efiemu],
[build and install the efiemu runtimes (default=guessed)])]) [build and install the efiemu runtimes (default=guessed)])])

9
grub-core/kern/misc.c
View file

@ -1283,7 +1283,7 @@ grub_fatal (const char *fmt, ...)
grub_abort (); grub_abort ();
} }
#if NEED_REGISTER_FRAME_INFO && !defined(GRUB_UTIL) #if (defined (__MINGW32__) || defined (__CYGWIN__)) && !defined(GRUB_UTIL)
void __register_frame_info (void) void __register_frame_info (void)
{ {
} }
@ -1291,6 +1291,13 @@ void __register_frame_info (void)
void __deregister_frame_info (void) void __deregister_frame_info (void)
{ {
} }
void ___chkstk_ms (void)
{
}
void __chkstk_ms (void)
{
}
#endif #endif
#if BOOT_TIME_STATS #if BOOT_TIME_STATS

4
include/grub/misc.h
View file

@ -377,9 +377,11 @@ grub_uint64_t EXPORT_FUNC(grub_divmod64) (grub_uint64_t n,
grub_uint64_t d, grub_uint64_t d,
grub_uint64_t *r); grub_uint64_t *r);
#if !defined(GRUB_UTIL) && NEED_REGISTER_FRAME_INFO #if (defined (__MINGW32__) || defined (__CYGWIN__)) && !defined(GRUB_UTIL)
void EXPORT_FUNC (__register_frame_info) (void); void EXPORT_FUNC (__register_frame_info) (void);
void EXPORT_FUNC (__deregister_frame_info) (void); void EXPORT_FUNC (__deregister_frame_info) (void);
void EXPORT_FUNC (___chkstk_ms) (void);
void EXPORT_FUNC (__chkstk_ms) (void);
#endif #endif
/* Inline functions. */ /* Inline functions. */