From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 From: Peter Jones Date: Fri, 28 Sep 2018 15:48:09 -0400 Subject: [PATCH] Do not allow stack trampolines, anywhere. Signed-off-by: Peter Jones --- configure.ac | 3 +++ conf/Makefile.common | 2 +- 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/configure.ac b/configure.ac index 40fcf567ae7..077df917593 100644 --- a/configure.ac +++ b/configure.ac @@ -1983,6 +1983,9 @@ if test x"$enable_wextra" != xno ; then HOST_CFLAGS="$HOST_CFLAGS -Wextra" fi +TARGET_CFLAGS="$TARGET_CFLAGS -Werror=trampolines -fno-trampolines" +HOST_CFLAGS="$HOST_CFLAGS -Werror=trampolines -fno-trampolines" + TARGET_CPP="$TARGET_CC -E" TARGET_CCAS=$TARGET_CC diff --git a/conf/Makefile.common b/conf/Makefile.common index 0d9910d7875..38375a7891c 100644 --- a/conf/Makefile.common +++ b/conf/Makefile.common @@ -66,7 +66,7 @@ grubconfdir = $(sysconfdir)/grub.d platformdir = $(pkglibdir)/$(target_cpu)-$(platform) starfielddir = $(pkgdatadir)/themes/starfield -CFLAGS_GNULIB = -Wno-undef -Wno-unused -Wno-unused-parameter -Wno-redundant-decls -Wno-unreachable-code +CFLAGS_GNULIB = -Wno-undef -Wno-unused -Wno-unused-parameter -Wno-redundant-decls -Wno-unreachable-code -Werror=trampolines -fno-trampolines CPPFLAGS_GNULIB = -I$(top_builddir)/grub-core/gnulib -I$(top_srcdir)/grub-core/gnulib CFLAGS_POSIX = -fno-builtin