re PR c/67819 (-Wduplicated-cond should take macros into account)

	* genemit.c (gen_exp): Remove -Wduplicated-cond hack.

	* c.opt (Wduplicated-cond): Don't enable by -Wall anymore.

	* c-c++-common/Wduplicated-cond-2.c: Skip until PR67819 is resolved.

From-SVN: r228405

gcc/ChangeLog

+2015-10-02  Marek Polacek  <polacek@redhat.com>
+
+	* genemit.c (gen_exp): Remove -Wduplicated-cond hack.
+
 2015-10-02  Aditya Kumar  <aditya.k7@samsung.com>
 
 	* graphite-scop-detection.c (loop_ivs_can_be_represented): New.

gcc/c-family/ChangeLog

 2015-10-02  Marek Polacek  <polacek@redhat.com>
 
+	* c.opt (Wduplicated-cond): Don't enable by -Wall anymore.
+
+2015-10-02  Marek Polacek  <polacek@redhat.com>
+
 	PR c/64249
 	* c-common.c (warn_duplicated_cond_add_or_warn): New function.
 	* c-common.h (warn_duplicated_cond_add_or_warn): Declare.

gcc/c-family/c.opt

@@ -407,7 +407,7 @@ C ObjC C++ ObjC++ Var(warn_div_by_zero) Init(1) Warning
 Warn about compile-time integer division by zero
 
 Wduplicated-cond
-C ObjC C++ ObjC++ Var(warn_duplicated_cond) Warning LangEnabledBy(C ObjC C++ ObjC++,Wall)
+C ObjC C++ ObjC++ Var(warn_duplicated_cond) Init(0) Warning
 Warn about duplicated conditions in an if-else-if chain
 
 Weffc++

gcc/genemit.c

@@ -182,7 +182,7 @@ gen_exp (rtx x, enum rtx_code subroutine_type, char *used)
 	       && INTVAL (x) <= MAX_SAVED_CONST_INT)
 	printf ("const_int_rtx[MAX_SAVED_CONST_INT + (%d)]",
 		(int) INTVAL (x));
-      else if (STORE_FLAG_VALUE > 1 && INTVAL (x) == STORE_FLAG_VALUE)
+      else if (INTVAL (x) == STORE_FLAG_VALUE)
 	printf ("const_true_rtx");
       else
 	{

gcc/testsuite/ChangeLog

+2015-10-02  Marek Polacek  <polacek@redhat.com>
+
+	* c-c++-common/Wduplicated-cond-2.c: Skip until PR67819 is resolved.
+
 2015-10-02  Sebastian Pop  <s.pop@samsung.com>
 
 	PR tree-optimization/67754

gcc/testsuite/c-c++-common/Wduplicated-cond-2.c

 /* PR c/64249 */
 /* { dg-do compile } */
 /* { dg-options "-Wall" } */
+/* { dg-skip-if "PR67819" { *-*-* } } */
 
 #ifndef __cplusplus
 # define bool _Bool