gcc/

	gcc/
	Backport from trunk r237138.
	2016-06-06  Kyrylo Tkachov  <kyrylo.tkachov@arm.com>

	PR middle-end/37780
	* config/arm/arm.md (ctzsi2): Convert to define_insn_and_split.

	gcc/
	Backport from trunk r237139.
	* config/aarch64/aarch64.md (ctz<mode>2): Convert to
	define_insn_and_split.

	2016-06-06  Kyrylo Tkachov  <kyrylo.tkachov@arm.com>

	PR middle-end/37780
	gcc/
	Backport from trunk r237141.
	* ifcvt.c (noce_try_ifelse_collapse): New function.
	Declare prototype.
	(noce_process_if_block): Call noce_try_ifelse_collapse.
	* simplify-rtx.c (simplify_cond_clz_ctz): New function.
	(simplify_ternary_operation): Use the above to simplify
	conditional CLZ/CTZ expressions.

	2016-06-06  Kyrylo Tkachov  <kyrylo.tkachov@arm.com>

	PR middle-end/37780
	gcc/testsuite/
	Backport from trunk r237141.
	2016-06-06  Kyrylo Tkachov  <kyrylo.tkachov@arm.com>

	PR middle-end/37780
	* gcc.c-torture/execute/pr37780.c: New test.
	* gcc.target/aarch64/pr37780_1.c: Likewise.
	* gcc.target/arm/pr37780_1.c: Likewise.

	gcc/
	Backport from trunk r237180.
	2016-06-07  Kyrylo Tkachov  <kyrylo.tkachov@arm.com>

	* simplify-rtx.c (simplify_cond_clz_ctz): Delete 'mode' local
	variable.

	gcc/testsuite/
	Backport from trunk r237308.
	2016-06-10  Christophe Lyon  <christophe.lyon@linaro.org>

	* gcc.target/arm/pr37780_1.c: Use arm_arch_v6t2 effective target
	and options.

Change-Id: I221bc478220826da3ffc3337596bcfa2a304e690