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

Remove enable_executable_check as it's not needed anymore.

Browse source 
Reported by: dougray.
This commit is contained in:
Vladimir 'phcoder' Serbinenko 2013-06-07 16:02:16 +02:00
parent 96dbe64813
commit 69544d1e43
4 changed files with 5 additions and 29 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
ChangeLog
View file

@ -1,3 +1,8 @@
2013-06-07 Vladimir Serbinenko <phcoder@gmail.com>
Remove enable_executable_check as it's not needed anymore.
Reported by: dougray.
2013-06-07 Vladimir Serbinenko <phcoder@gmail.com> 2013-06-07 Vladimir Serbinenko <phcoder@gmail.com>
* grub-core/disk/diskfilter.c (insert_array): Fix order to discover * grub-core/disk/diskfilter.c (insert_array): Fix order to discover

26
acinclude.m4
View file

@ -313,32 +313,6 @@ else
fi fi
]) ])
dnl Check if the C compiler generates calls to `__enable_execute_stack()'.
AC_DEFUN([grub_CHECK_ENABLE_EXECUTE_STACK],[
AC_MSG_CHECKING([whether `$CC' generates calls to `__enable_execute_stack()'])
AC_LANG_CONFTEST([AC_LANG_SOURCE([[
void f (int (*p) (void));
void g (int i)
{
int nestedfunc (void) { return i; }
f (nestedfunc);
}
]])])
if AC_TRY_COMMAND([${CC-cc} ${CFLAGS} -S conftest.c]) && test -s conftest.s; then
true
else
AC_MSG_ERROR([${CC-cc} failed to produce assembly code])
fi
if grep __enable_execute_stack conftest.s >/dev/null 2>&1; then
NEED_ENABLE_EXECUTE_STACK=1
AC_MSG_RESULT([yes])
else
NEED_ENABLE_EXECUTE_STACK=0
AC_MSG_RESULT([no])
fi
rm -f conftest*
])
dnl Check if the C compiler supports `-fstack-protector'. dnl Check if the C compiler supports `-fstack-protector'.
AC_DEFUN([grub_CHECK_STACK_PROTECTOR],[ AC_DEFUN([grub_CHECK_STACK_PROTECTOR],[

2
config.h.in
View file

@ -39,8 +39,6 @@
#define GRUB_BOOT_DIR_NAME "@bootdirname@" #define GRUB_BOOT_DIR_NAME "@bootdirname@"
/* Default grub directory name */ /* Default grub directory name */
#define GRUB_DIR_NAME "@grubdirname@" #define GRUB_DIR_NAME "@grubdirname@"
/* Define to 1 if GCC generates calls to __enable_execute_stack(). */
#define NEED_ENABLE_EXECUTE_STACK @NEED_ENABLE_EXECUTE_STACK@
/* Define to 1 if GCC generates calls to __register_frame_info(). */ /* Define to 1 if GCC generates calls to __register_frame_info(). */
#define NEED_REGISTER_FRAME_INFO @NEED_REGISTER_FRAME_INFO@ #define NEED_REGISTER_FRAME_INFO @NEED_REGISTER_FRAME_INFO@

1
configure.ac
View file

@ -1137,7 +1137,6 @@ AC_SUBST(BSS_START_SYMBOL)
AC_SUBST(END_SYMBOL) AC_SUBST(END_SYMBOL)
AC_SUBST(PACKAGE) AC_SUBST(PACKAGE)
AC_SUBST(VERSION) AC_SUBST(VERSION)
AC_SUBST(NEED_ENABLE_EXECUTE_STACK)
AC_SUBST(NEED_REGISTER_FRAME_INFO) AC_SUBST(NEED_REGISTER_FRAME_INFO)
# #