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

* kern/misc.c: Disable the __enable_execute_stack hack for utilities.

Browse source 
* include/grub/misc.h: Likewise.
This commit is contained in:
Grégoire Sutre 2010-04-03 21:00:21 +02:00 committed by Vladimir 'phcoder' Serbinenko
parent b9396631bc
commit 187bbe3d9c
3 changed files with 7 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
ChangeLog
View file

@ -1,3 +1,8 @@
2010-04-03 Grégoire Sutre <gregoire.sutre@gmail.com>
* kern/misc.c: Disable the __enable_execute_stack hack for utilities.
* include/grub/misc.h: Likewise.
2010-04-03 Grégoire Sutre <gregoire.sutre@gmail.com> 2010-04-03 Grégoire Sutre <gregoire.sutre@gmail.com>
* util/grub-install.in: Add `|| exit 1' to all grub-probe calls * util/grub-install.in: Add `|| exit 1' to all grub-probe calls

2
include/grub/misc.h
View file

@ -261,7 +261,7 @@ grub_size_t EXPORT_FUNC(grub_utf8_to_ucs4) (grub_uint32_t *dest,
grub_uint64_t EXPORT_FUNC(grub_divmod64) (grub_uint64_t n, grub_uint64_t EXPORT_FUNC(grub_divmod64) (grub_uint64_t n,
grub_uint32_t d, grub_uint32_t *r); grub_uint32_t d, grub_uint32_t *r);
#ifdef NEED_ENABLE_EXECUTE_STACK #if defined(NEED_ENABLE_EXECUTE_STACK) && !defined(GRUB_UTIL)
void EXPORT_FUNC(__enable_execute_stack) (void *addr); void EXPORT_FUNC(__enable_execute_stack) (void *addr);
#endif #endif

2
kern/misc.c
View file

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