From 72b7c7aa36c495d63e6add293733b1de84ddb39d Mon Sep 17 00:00:00 2001 From: Colin Watson Date: Tue, 16 Nov 2010 15:50:20 +0000 Subject: [PATCH 1/2] * configure.ac: Make error messages less confusing by testing for -Wtrampolines rather than -Wno-trampolines (since -Wno-* is always accepted, but produces a diagnostic if something else is wrong). --- ChangeLog | 6 ++++++ configure.ac | 5 ++++- 2 files changed, 10 insertions(+), 1 deletion(-) diff --git a/ChangeLog b/ChangeLog index 8f78477e9..7eada1d49 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,9 @@ +2010-11-16 Colin Watson + + * configure.ac: Make error messages less confusing by testing for + -Wtrampolines rather than -Wno-trampolines (since -Wno-* is always + accepted, but produces a diagnostic if something else is wrong). + 2010-11-15 Vladimir Serbinenko * grub-core/term/at_keyboard.c (grub_keyboard_controller_read) diff --git a/configure.ac b/configure.ac index 2b75883bc..c013c9022 100644 --- a/configure.ac +++ b/configure.ac @@ -673,7 +673,10 @@ fi AC_CACHE_CHECK([whether -Wno-trampolines work], [grub_cv_cc_wnotrampolines], [ SAVED_CFLAGS="$CFLAGS" - CFLAGS="$TARGET_CFLAGS -Wno-trampolines" + # Test for -Wtrampolines rather than -Wno-trampolines to reduce confusion + # in the event of later failures (since -Wno-* is always accepted, but + # produces a diagnostic if something else is wrong). + CFLAGS="$TARGET_CFLAGS -Wtrampolines" AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[#include int va_arg_func (int fixed, va_list args);]], [[]])], [grub_cv_cc_wnotrampolines=yes], From 24ec575b72d8d5f6505ba1201ad7d5290cec295d Mon Sep 17 00:00:00 2001 From: Colin Watson Date: Tue, 16 Nov 2010 15:54:18 +0000 Subject: [PATCH 2/2] * conf/Makefile.common (CFLAGS_GNULIB): Add -Wno-unused-parameter. (-Wunused implies -Wunused-parameter, but not vice versa). --- ChangeLog | 5 +++++ conf/Makefile.common | 2 +- 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/ChangeLog b/ChangeLog index 7eada1d49..42489cab7 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,8 @@ +2010-11-16 Colin Watson + + * conf/Makefile.common (CFLAGS_GNULIB): Add -Wno-unused-parameter. + (-Wunused implies -Wunused-parameter, but not vice versa). + 2010-11-16 Colin Watson * configure.ac: Make error messages less confusing by testing for diff --git a/conf/Makefile.common b/conf/Makefile.common index 73b3d819b..2df8465c0 100644 --- a/conf/Makefile.common +++ b/conf/Makefile.common @@ -97,7 +97,7 @@ platformdir = $(pkglibrootdir)/$(target_cpu)-$(platform) CFLAGS_GCRY = -Wno-error -Wno-missing-field-initializers CPPFLAGS_GCRY = -I$(top_srcdir)/grub-core/lib/libgcrypt_wrap -CFLAGS_GNULIB = -Wno-undef -Wno-sign-compare -Wno-unused +CFLAGS_GNULIB = -Wno-undef -Wno-sign-compare -Wno-unused -Wno-unused-parameter CPPFLAGS_GNULIB = -I$(top_builddir)/grub-core/gnulib -I$(top_srcdir)/grub-core/gnulib CFLAGS_POSIX = -fno-builtin