Skip to content

Commit

Permalink
configure: remove workaround for gcc's -Wno-maybe-uninitialized
Browse files Browse the repository at this point in the history
Since r174770 gcc version check is not needed because CXX_FLAG_CHECK
implements the workaround itself.


git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@175080 91177308-0d34-0410-b5e6-96231b3b80d8
  • Loading branch information
gribozavr committed Feb 13, 2013
1 parent ccb51f9 commit 7c62701
Show file tree
Hide file tree
Showing 2 changed files with 16 additions and 44 deletions.
28 changes: 5 additions & 23 deletions autoconf/configure.ac
Original file line number Diff line number Diff line change
Expand Up @@ -1272,39 +1272,21 @@ CXX_FLAG_CHECK(NO_VARIADIC_MACROS, [-Wno-variadic-macros])
CXX_FLAG_CHECK(NO_MISSING_FIELD_INITIALIZERS, [-Wno-missing-field-initializers])
CXX_FLAG_CHECK(NO_NESTED_ANON_TYPES, [-Wno-nested-anon-types])
CXX_FLAG_CHECK(COVERED_SWITCH_DEFAULT, [-Wcovered-switch-default])

dnl GCC's potential uninitialized use analysis is weak and presents lots of
dnl false positives, so disable it.
NO_UNINITIALIZED=
NO_MAYBE_UNINITIALIZED=
if test "$GXX" = "yes"
then
CXX_FLAG_CHECK(NO_MAYBE_UNINITIALIZED, [-Wno-maybe-uninitialized])
dnl gcc 4.7 introduced -Wmaybe-uninitialized to distinguish cases which are
dnl known to be uninitialized from cases which might be uninitialized. We
dnl known to be uninitialized from cases which might be uninitialized. We
dnl still want to catch the first kind of errors.
if test "$NO_MAYBE_UNINITIALIZED" != "-Wno-maybe-uninitialized"
if test -z "$NO_MAYBE_UNINITIALIZED"
then
CXX_FLAG_CHECK(NO_UNINITIALIZED, [-Wno-uninitialized])
else
dnl Some versions of gcc accept unsupported -W flags if there is
dnl no warning but stop with an error when a warning is
dnl encountered. If this gcc is earlier than 4.7, just use
dnl -Wno-uninitialized.
gxx_version=`$CXX -dumpversion`
gxx_version_major=`echo $gxx_version | cut -d'.' -f1`
gxx_version_minor=`echo $gxx_version | cut -d'.' -f2`
gxx_version_patch=`echo $gxx_version | cut -d'.' -f3`

if test "$gxx_version_major" -ge "4" \
&& test "$gxx_version_minor" -ge "7"; then
dnl AC_SUBST doesn't work with empty strings.
NO_UNINITIALIZED=
else
NO_MAYBE_UNINITIALIZED=
CXX_FLAG_CHECK(NO_UNINITIALIZED, [-Wno-uninitialized])
fi
fi
else
NO_UNINITIALIZED=
NO_MAYBE_UNINITIALIZED=
fi
AC_MSG_RESULT([$NO_VARIADIC_MACROS $NO_MISSING_FIELD_INITIALIZERS $NO_NESTED_ANON_TYPES $COVERED_SWITCH_DEFAULT $NO_UNINITIALIZED $NO_MAYBE_UNINITIALIZED])

Expand Down
32 changes: 11 additions & 21 deletions configure
Original file line number Diff line number Diff line change
Expand Up @@ -8719,15 +8719,19 @@ if test "${enable_ltdl_install+set}" = set; then
fi


if test x"${enable_ltdl_install-no}" != xno; then


if test x"${enable_ltdl_install-no}" != xno; then
INSTALL_LTDL_TRUE=
INSTALL_LTDL_FALSE='#'
else
INSTALL_LTDL_TRUE='#'
INSTALL_LTDL_FALSE=
fi

if test x"${enable_ltdl_convenience-no}" != xno; then


if test x"${enable_ltdl_convenience-no}" != xno; then
CONVENIENCE_LTDL_TRUE=
CONVENIENCE_LTDL_FALSE='#'
else
Expand Down Expand Up @@ -10494,7 +10498,7 @@ else
lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
lt_status=$lt_dlunknown
cat > conftest.$ac_ext <<EOF
#line 10497 "configure"
#line 10501 "configure"
#include "confdefs.h"

#if HAVE_DLFCN_H
Expand Down Expand Up @@ -12265,32 +12269,18 @@ NO_NESTED_ANON_TYPES=`$CXX -Werror -Wnested-anon-types -fsyntax-only -xc /dev/nu

COVERED_SWITCH_DEFAULT=`$CXX -Werror -Wcovered-switch-default -fsyntax-only -xc /dev/null 2>/dev/null && echo -Wcovered-switch-default`


NO_UNINITIALIZED=
NO_MAYBE_UNINITIALIZED=
if test "$GXX" = "yes"
then
NO_MAYBE_UNINITIALIZED=`$CXX -Werror -Wmaybe-uninitialized -fsyntax-only -xc /dev/null 2>/dev/null && echo -Wno-maybe-uninitialized`

if test "$NO_MAYBE_UNINITIALIZED" != "-Wno-maybe-uninitialized"
if test -z "$NO_MAYBE_UNINITIALIZED"
then
NO_UNINITIALIZED=`$CXX -Werror -Wuninitialized -fsyntax-only -xc /dev/null 2>/dev/null && echo -Wno-uninitialized`

else
gxx_version=`$CXX -dumpversion`
gxx_version_major=`echo $gxx_version | cut -d'.' -f1`
gxx_version_minor=`echo $gxx_version | cut -d'.' -f2`
gxx_version_patch=`echo $gxx_version | cut -d'.' -f3`

if test "$gxx_version_major" -ge "4" \
&& test "$gxx_version_minor" -ge "7"; then
NO_UNINITIALIZED=
else
NO_MAYBE_UNINITIALIZED=
NO_UNINITIALIZED=`$CXX -Werror -Wuninitialized -fsyntax-only -xc /dev/null 2>/dev/null && echo -Wno-uninitialized`

fi
fi
else
NO_UNINITIALIZED=
NO_MAYBE_UNINITIALIZED=
fi
{ echo "$as_me:$LINENO: result: $NO_VARIADIC_MACROS $NO_MISSING_FIELD_INITIALIZERS $NO_NESTED_ANON_TYPES $COVERED_SWITCH_DEFAULT $NO_UNINITIALIZED $NO_MAYBE_UNINITIALIZED" >&5
echo "${ECHO_T}$NO_VARIADIC_MACROS $NO_MISSING_FIELD_INITIALIZERS $NO_NESTED_ANON_TYPES $COVERED_SWITCH_DEFAULT $NO_UNINITIALIZED $NO_MAYBE_UNINITIALIZED" >&6; }
Expand Down

0 comments on commit 7c62701

Please sign in to comment.