diff -rupN gcc-4.9-20150225/gcc/ChangeLog gcc-4.9-20150225.pr64304//gcc/ChangeLog --- gcc-4.9-20150225/gcc/ChangeLog 2015-03-04 20:48:30.000000000 -0500 +++ gcc-4.9-20150225.pr64304//gcc/ChangeLog 2015-03-04 20:55:59.000000000 -0500 @@ -1,3 +1,13 @@ +2015-03-05 Shanyao Chen + + Backported from mainline + 2015-01-19 Jiong Wang + Andrew Pinski + + PR target/64304 + * config/aarch64/aarch64.md (define_insn "*ashl3_insn"): Deleted. + (ashl3): Don't expand if operands[2] is not constant. + 2015-02-25 Kai Tietz PR tree-optimization/61917 diff -rupN gcc-4.9-20150225/gcc/config/aarch64/aarch64.md gcc-4.9-20150225.pr64304//gcc/config/aarch64/aarch64.md --- gcc-4.9-20150225/gcc/config/aarch64/aarch64.md 2015-03-04 20:41:03.000000000 -0500 +++ gcc-4.9-20150225.pr64304//gcc/config/aarch64/aarch64.md 2015-03-04 20:46:44.000000000 -0500 @@ -2719,6 +2719,8 @@ DONE; } } + else + FAIL; } ) @@ -2947,15 +2949,6 @@ [(set_attr "type" "shift_reg")] ) -(define_insn "*ashl3_insn" - [(set (match_operand:SHORT 0 "register_operand" "=r") - (ashift:SHORT (match_operand:SHORT 1 "register_operand" "r") - (match_operand:QI 2 "aarch64_reg_or_shift_imm_si" "rUss")))] - "" - "lsl\\t%0, %1, %2" - [(set_attr "type" "shift_reg")] -) - (define_insn "*3_insn" [(set (match_operand:SHORT 0 "register_operand" "=r") (ASHIFT:SHORT (match_operand:SHORT 1 "register_operand" "r") diff -rupN gcc-4.9-20150225/gcc/testsuite/ChangeLog gcc-4.9-20150225.pr64304//gcc/testsuite/ChangeLog --- gcc-4.9-20150225/gcc/testsuite/ChangeLog 2015-03-04 21:00:24.000000000 -0500 +++ gcc-4.9-20150225.pr64304//gcc/testsuite/ChangeLog 2015-03-04 21:03:21.000000000 -0500 @@ -1,3 +1,10 @@ +2015-03-05 Shanyao chen + + Backported from mainline + 2015-01-19 Jiong Wang + + * gcc.target/aarch64/pr64304.c: New testcase. + 2015-02-25 Kai Tietz Backported from mainline diff -rupN gcc-4.9-20150225/gcc/testsuite/gcc.target/aarch64/pr64304.c gcc-4.9-20150225.pr64304//gcc/testsuite/gcc.target/aarch64/pr64304.c --- gcc-4.9-20150225/gcc/testsuite/gcc.target/aarch64/pr64304.c 1969-12-31 19:00:00.000000000 -0500 +++ gcc-4.9-20150225.pr64304//gcc/testsuite/gcc.target/aarch64/pr64304.c 2015-03-04 20:59:24.000000000 -0500 @@ -0,0 +1,18 @@ +/* { dg-do compile } */ +/* { dg-options "-O2 --save-temps" } */ + +unsigned char byte = 0; + +void +set_bit (unsigned int bit, unsigned char value) +{ + unsigned char mask = (unsigned char) (1 << (bit & 7)); + + if (! value) + byte &= (unsigned char)~mask; + else + byte |= mask; + /* { dg-final { scan-assembler "and\tw\[0-9\]+, w\[0-9\]+, 7" } } */ +} + +/* { dg-final { cleanup-saved-temps } } */