diff options
author | Chandler Carruth <chandlerc@gmail.com> | 2012-02-28 19:26:56 +0000 |
---|---|---|
committer | Chandler Carruth <chandlerc@gmail.com> | 2012-02-28 19:26:56 +0000 |
commit | 0bd3913d9607b273b239a3ddb5199bc38b818658 (patch) | |
tree | a7188823ae22c540beca5da3e6f31ca4d2de354f /llvm/projects | |
parent | e0a7c28627fecb00aad5cefca98c57d0fdc987de (diff) | |
download | llvm-0bd3913d9607b273b239a3ddb5199bc38b818658.zip llvm-0bd3913d9607b273b239a3ddb5199bc38b818658.tar.gz llvm-0bd3913d9607b273b239a3ddb5199bc38b818658.tar.bz2 |
Temporarily revert r151609, which enabled a new warning for LLVM and
Clang builds. The detection logic for compilers that support the warning
isn't working. Rafael is going to investigate it, but didn't want people
to have to wade through build spam until then.
llvm-svn: 151649
Diffstat (limited to 'llvm/projects')
-rw-r--r-- | llvm/projects/sample/Makefile.llvm.config.in | 2 | ||||
-rw-r--r-- | llvm/projects/sample/Makefile.llvm.rules | 2 | ||||
-rw-r--r-- | llvm/projects/sample/autoconf/configure.ac | 3 | ||||
-rwxr-xr-x | llvm/projects/sample/configure | 12 |
4 files changed, 6 insertions, 13 deletions
diff --git a/llvm/projects/sample/Makefile.llvm.config.in b/llvm/projects/sample/Makefile.llvm.config.in index 9e0c34c..a53e7b1 100644 --- a/llvm/projects/sample/Makefile.llvm.config.in +++ b/llvm/projects/sample/Makefile.llvm.config.in @@ -301,8 +301,6 @@ BINUTILS_INCDIR := @BINUTILS_INCDIR@ NO_MISSING_FIELD_INITIALIZERS = @NO_MISSING_FIELD_INITIALIZERS@ # -Wno-variadic-macros NO_VARIADIC_MACROS = @NO_VARIADIC_MACROS@ -# -Wcovered-switch-default -COVERED_SWITCH_DEFAULT = @COVERED_SWITCH_DEFAULT@ # Was polly found in tools/polly? LLVM_HAS_POLLY = @LLVM_HAS_POLLY@ diff --git a/llvm/projects/sample/Makefile.llvm.rules b/llvm/projects/sample/Makefile.llvm.rules index 7467d84..f496bd4 100644 --- a/llvm/projects/sample/Makefile.llvm.rules +++ b/llvm/projects/sample/Makefile.llvm.rules @@ -571,7 +571,7 @@ ifndef NO_PEDANTIC CompileCommonOpts += -pedantic -Wno-long-long endif CompileCommonOpts += -Wall -W -Wno-unused-parameter -Wwrite-strings \ - $(EXTRA_OPTIONS) $(COVERED_SWITCH_DEFAULT) + $(EXTRA_OPTIONS) # Enable cast-qual for C++; the workaround is to use const_cast. CXX.Flags += -Wcast-qual diff --git a/llvm/projects/sample/autoconf/configure.ac b/llvm/projects/sample/autoconf/configure.ac index a1110ec..1caff511 100644 --- a/llvm/projects/sample/autoconf/configure.ac +++ b/llvm/projects/sample/autoconf/configure.ac @@ -1019,8 +1019,7 @@ dnl Check optional compiler flags. AC_MSG_CHECKING([optional compiler flags]) CXX_FLAG_CHECK(NO_VARIADIC_MACROS, [-Wno-variadic-macros]) CXX_FLAG_CHECK(NO_MISSING_FIELD_INITIALIZERS, [-Wno-missing-field-initializers]) -CXX_FLAG_CHECK(COVERED_SWITCH_DEFAULT, [-Wcovered-switch-default]) -AC_MSG_RESULT([$NO_VARIADIC_MACROS $NO_MISSING_FIELD_INITIALIZERS $COVERED_SWITCH_DEFAULT]) +AC_MSG_RESULT([$NO_VARIADIC_MACROS $NO_MISSING_FIELD_INITIALIZERS]) dnl===-----------------------------------------------------------------------=== dnl=== diff --git a/llvm/projects/sample/configure b/llvm/projects/sample/configure index 052a7f2..dab1dc5 100755 --- a/llvm/projects/sample/configure +++ b/llvm/projects/sample/configure @@ -762,7 +762,6 @@ CONVENIENCE_LTDL_FALSE LIBADD_DL NO_VARIADIC_MACROS NO_MISSING_FIELD_INITIALIZERS -COVERED_SWITCH_DEFAULT USE_UDIS86 USE_OPROFILE HAVE_PTHREAD @@ -10366,7 +10365,7 @@ else lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 lt_status=$lt_dlunknown cat > conftest.$ac_ext <<EOF -#line 10369 "configure" +#line 10368 "configure" #include "confdefs.h" #if HAVE_DLFCN_H @@ -12125,10 +12124,8 @@ NO_VARIADIC_MACROS=`$CXX -Wno-variadic-macros -fsyntax-only -xc /dev/null 2>/dev NO_MISSING_FIELD_INITIALIZERS=`$CXX -Wno-missing-field-initializers -fsyntax-only -xc /dev/null 2>/dev/null && echo -Wno-missing-field-initializers` -COVERED_SWITCH_DEFAULT=`$CXX -Wcovered-switch-default -fsyntax-only -xc /dev/null 2>/dev/null && echo -Wcovered-switch-default` - -{ echo "$as_me:$LINENO: result: $NO_VARIADIC_MACROS $NO_MISSING_FIELD_INITIALIZERS $COVERED_SWITCH_DEFAULT" >&5 -echo "${ECHO_T}$NO_VARIADIC_MACROS $NO_MISSING_FIELD_INITIALIZERS $COVERED_SWITCH_DEFAULT" >&6; } +{ echo "$as_me:$LINENO: result: $NO_VARIADIC_MACROS $NO_MISSING_FIELD_INITIALIZERS" >&5 +echo "${ECHO_T}$NO_VARIADIC_MACROS $NO_MISSING_FIELD_INITIALIZERS" >&6; } @@ -21819,7 +21816,6 @@ CONVENIENCE_LTDL_FALSE!$CONVENIENCE_LTDL_FALSE$ac_delim LIBADD_DL!$LIBADD_DL$ac_delim NO_VARIADIC_MACROS!$NO_VARIADIC_MACROS$ac_delim NO_MISSING_FIELD_INITIALIZERS!$NO_MISSING_FIELD_INITIALIZERS$ac_delim -COVERED_SWITCH_DEFAULT!$COVERED_SWITCH_DEFAULT$ac_delim USE_UDIS86!$USE_UDIS86$ac_delim USE_OPROFILE!$USE_OPROFILE$ac_delim HAVE_PTHREAD!$HAVE_PTHREAD$ac_delim @@ -21847,7 +21843,7 @@ LIBOBJS!$LIBOBJS$ac_delim LTLIBOBJS!$LTLIBOBJS$ac_delim _ACEOF - if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 91; then + if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 90; then break elif $ac_last_try; then { { echo "$as_me:$LINENO: error: could not make $CONFIG_STATUS" >&5 |