Use logical_op_short_circuit to skip targets in ssa-thread-14.c.

gcc/testsuite/

	* gcc.dg/tree-ssa/ssa-thread-14.c (dg-options): Use
	logical_op_short_circuit to skip targets.
	(dg-additional-options): Don't pass -mbranch-cost=2 for MIPS, AVR
	and s390.

From-SVN: r245711

gcc/testsuite/ChangeLog

+2017-02-24  Toma Tabacu  <toma.tabacu@imgtec.com>
+
+	* gcc.dg/tree-ssa/ssa-thread-14.c (dg-options): Use
+	logical_op_short_circuit to skip targets.
+	(dg-additional-options): Don't pass -mbranch-cost=2 for MIPS, AVR
+	and s390.
+
 2017-02-24  Eric Botcazou  <ebotcazou@adacore.com>
 
 	* gnat.dg/opt63.adb: New test.

gcc/testsuite/gcc.dg/tree-ssa/ssa-thread-14.c

-/* { dg-do compile { target { ! { m68k*-*-* mmix*-*-* mep*-*-* bfin*-*-* v850*-*-* moxie*-*-* cris*-*-* m32c*-*-* fr30*-*-* mcore*-*-* powerpc*-*-* xtensa*-*-* hppa*-*-* nios2*-*-* } } } }  */
+/* { dg-do compile { target { ! { logical_op_short_circuit || { m68k*-*-* mmix*-*-* mep*-*-* bfin*-*-* v850*-*-* moxie*-*-* cris*-*-* m32c*-*-* fr30*-*-* mcore*-*-* powerpc*-*-* xtensa*-*-* hppa*-*-* nios2*-*-* } } } } }  */
 /* { dg-additional-options "-O2 -fdump-tree-vrp-details" }  */
-/* { dg-additional-options "-mbranch-cost=2" { target mips*-*-* avr-*-* s390*-*-* i?86-*-* x86_64-*-* } }  */
+/* { dg-additional-options "-mbranch-cost=2" { target i?86-*-* x86_64-*-* } }  */
 /* { dg-final { scan-tree-dump-times "Threaded jump" 8 "vrp1" } }  */
 
 void foo (void);