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

Fix grub-emu issues on NetBSD, with gcc 4.1.3.

Browse source 
* conf/any-emu.rmk: Remove unnecessary COMMON_CFLAGS.
	* include/grub/emu/misc.h (canonicalize_file_name): New Prototype.
	* kern/misc.c (__enable_execute_stack): Disable on
	GRUB_MACHINE_EMU.
This commit is contained in:
BVK Chaitanya 2010-05-28 19:18:45 +05:30
parent a33075b941
commit fa4b84900a
4 changed files with 12 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

3
kern/misc.c
View file

@ -1058,7 +1058,7 @@ grub_abort (void)
void abort (void) __attribute__ ((alias ("grub_abort")));
#endif
#if defined(NEED_ENABLE_EXECUTE_STACK) && !defined(GRUB_UTIL)
#if defined(NEED_ENABLE_EXECUTE_STACK) && !defined(GRUB_UTIL) && !defined(GRUB_MACHINE_EMU)
/* Some gcc versions generate a call to this function
in trampolines for nested functions. */
void __enable_execute_stack (void *addr __attribute__ ((unused)))
@ -1075,3 +1075,4 @@ void __deregister_frame_info (void)
{
}
#endif