1
0
mirror of git://git.gnupg.org/gnupg.git synced 2024-05-29 21:58:04 +02:00

Silence annoying ABI change warning.

* configure.ac [GCC]: Pass -Wno-psabi for gcc >= 4.6.  Avoid some gcc
option tests for gcc >= 4.6
--
Signed-off-by: Werner Koch <wk@gnupg.org>
(cherry picked from commit d04399a6a8)

Resolved Conflicts:
	configure.ac: merged.
This commit is contained in:
Werner Koch 2013-11-27 18:38:20 +01:00
parent 8e0ba4ecd3
commit 111f082487

View File

@ -1478,21 +1478,36 @@ AC_SUBST(W32SOCKLIBS)
# #
AC_MSG_NOTICE([checking for cc features]) AC_MSG_NOTICE([checking for cc features])
if test "$GCC" = yes; then if test "$GCC" = yes; then
# Note that it is okay to use CFLAGS here because this are just # Check whether gcc does not emit a diagnositc for unknow -Wno-*
# options. This is the case for gcc >= 4.6
AC_MSG_CHECKING([if gcc ignores unknown -Wno-* options])
AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[
#if __GNUC__ < 4 || (__GNUC__ == 4 && __GNUC_MINOR__ < 6 )
#kickerror
#endif]],[])],[_gcc_silent_wno=yes],[_gcc_silent_wno=no])
AC_MSG_RESULT($_gcc_silent_wno)
# Note that it is okay to use CFLAGS here because these are just
# warning options and the user should have a chance of overriding # warning options and the user should have a chance of overriding
# them. # them.
if test "$USE_MAINTAINER_MODE" = "yes"; then if test "$USE_MAINTAINER_MODE" = "yes"; then
CFLAGS="$CFLAGS -O3 -Wall -Wcast-align -Wshadow -Wstrict-prototypes" CFLAGS="$CFLAGS -O3 -Wall -Wcast-align -Wshadow -Wstrict-prototypes"
CFLAGS="$CFLAGS -Wformat -Wno-format-y2k -Wformat-security" CFLAGS="$CFLAGS -Wformat -Wno-format-y2k -Wformat-security"
AC_MSG_CHECKING([if gcc supports -Wno-missing-field-initializers]) if test x"$_gcc_silent_wno" = xyes ; then
_gcc_cflags_save=$CFLAGS _gcc_wopt=yes
CFLAGS="-Wno-missing-field-initializers" else
AC_COMPILE_IFELSE([AC_LANG_PROGRAM([],[])],_gcc_wopt=yes,_gcc_wopt=no) AC_MSG_CHECKING([if gcc supports -Wno-missing-field-initializers])
AC_MSG_RESULT($_gcc_wopt) _gcc_cflags_save=$CFLAGS
CFLAGS=$_gcc_cflags_save; CFLAGS="-Wno-missing-field-initializers"
AC_COMPILE_IFELSE([AC_LANG_PROGRAM([],[])],
[_gcc_wopt=yes],[_gcc_wopt=no])
AC_MSG_RESULT($_gcc_wopt)
CFLAGS=$_gcc_cflags_save;
fi
if test x"$_gcc_wopt" = xyes ; then if test x"$_gcc_wopt" = xyes ; then
CFLAGS="$CFLAGS -W -Wno-sign-compare -Wno-missing-field-initializers" CFLAGS="$CFLAGS -W -Wno-sign-compare -Wno-missing-field-initializers"
fi fi
AC_MSG_CHECKING([if gcc supports -Wdeclaration-after-statement]) AC_MSG_CHECKING([if gcc supports -Wdeclaration-after-statement])
_gcc_cflags_save=$CFLAGS _gcc_cflags_save=$CFLAGS
CFLAGS="-Wdeclaration-after-statement" CFLAGS="-Wdeclaration-after-statement"
@ -1506,12 +1521,17 @@ if test "$GCC" = yes; then
CFLAGS="$CFLAGS -Wall" CFLAGS="$CFLAGS -Wall"
fi fi
AC_MSG_CHECKING([if gcc supports -Wno-pointer-sign]) if test x"$_gcc_silent_wno" = xyes ; then
_gcc_cflags_save=$CFLAGS _gcc_psign=yes
CFLAGS="-Wno-pointer-sign" else
AC_COMPILE_IFELSE([AC_LANG_PROGRAM([],[])],_gcc_psign=yes,_gcc_psign=no) AC_MSG_CHECKING([if gcc supports -Wno-pointer-sign])
AC_MSG_RESULT($_gcc_psign) _gcc_cflags_save=$CFLAGS
CFLAGS=$_gcc_cflags_save; CFLAGS="-Wno-pointer-sign"
AC_COMPILE_IFELSE([AC_LANG_PROGRAM([],[])],
[_gcc_psign=yes],[_gcc_psign=no])
AC_MSG_RESULT($_gcc_psign)
CFLAGS=$_gcc_cflags_save;
fi
if test x"$_gcc_psign" = xyes ; then if test x"$_gcc_psign" = xyes ; then
CFLAGS="$CFLAGS -Wno-pointer-sign" CFLAGS="$CFLAGS -Wno-pointer-sign"
fi fi
@ -1525,6 +1545,14 @@ if test "$GCC" = yes; then
if test x"$_gcc_psign" = xyes ; then if test x"$_gcc_psign" = xyes ; then
CFLAGS="$CFLAGS -Wpointer-arith" CFLAGS="$CFLAGS -Wpointer-arith"
fi fi
# The undocumented option -Wno-psabi suppresses the annoying
# "the ABI of passing union with long double has changed in GCC 4.4"
# which is emitted in estream-printf.c but entirely irrelvant
# because that union is local to the file.
if test x"$_gcc_silent_wno" = xyes ; then
CFLAGS="$CFLAGS -Wno-psabi"
fi
fi fi