diff options
Diffstat (limited to 'toolchain-layer/recipes-devtools/gcc/gcc-4.6/linaro/gcc-4.6-linaro-r106831.patch')
| -rw-r--r-- | toolchain-layer/recipes-devtools/gcc/gcc-4.6/linaro/gcc-4.6-linaro-r106831.patch | 123 |
1 files changed, 123 insertions, 0 deletions
diff --git a/toolchain-layer/recipes-devtools/gcc/gcc-4.6/linaro/gcc-4.6-linaro-r106831.patch b/toolchain-layer/recipes-devtools/gcc/gcc-4.6/linaro/gcc-4.6-linaro-r106831.patch new file mode 100644 index 0000000000..ad91d77366 --- /dev/null +++ b/toolchain-layer/recipes-devtools/gcc/gcc-4.6/linaro/gcc-4.6-linaro-r106831.patch @@ -0,0 +1,123 @@ +2011-10-19 Andrew Stubbs <ams@codesourcery.com> + + Backport from FSF: + + 2011-10-18 Andrew Stubbs <ams@codesourcery.com> + + PR tree-optimization/50717 + + gcc/ + * tree-ssa-math-opts.c (is_widening_mult_p): Remove the 'type' + parameter. Calculate 'type' from stmt. + (convert_mult_to_widen): Update call the is_widening_mult_p. + (convert_plusminus_to_widen): Likewise. + + gcc/testsuite/ + * gcc.dg/pr50717-1.c: New file. + * gcc.target/arm/wmul-12.c: Correct types. + * gcc.target/arm/wmul-8.c: Correct types. + +=== added file 'gcc/testsuite/gcc.dg/pr50717-1.c' +--- old/gcc/testsuite/gcc.dg/pr50717-1.c 1970-01-01 00:00:00 +0000 ++++ new/gcc/testsuite/gcc.dg/pr50717-1.c 2011-10-19 14:42:50 +0000 +@@ -0,0 +1,26 @@ ++/* PR tree-optimization/50717 */ ++/* Ensure that widening multiply-and-accumulate is not used where integer ++ type promotion or users' casts should prevent it. */ ++ ++/* { dg-options "-O2 -fdump-tree-widening_mul" } */ ++ ++long long ++f (unsigned int a, char b, long long c) ++{ ++ return (a * b) + c; ++} ++ ++int ++g (short a, short b, int c) ++{ ++ return (short)(a * b) + c; ++} ++ ++int ++h (char a, char b, int c) ++{ ++ return (char)(a * b) + c; ++} ++ ++/* { dg-final { scan-tree-dump-times "WIDEN_MULT_PLUS_EXPR" 0 "widening_mul" } } */ ++/* { dg-final { cleanup-tree-dump "widening_mul" } } */ + +=== modified file 'gcc/testsuite/gcc.target/arm/wmul-12.c' +--- old/gcc/testsuite/gcc.target/arm/wmul-12.c 2011-07-22 15:46:42 +0000 ++++ new/gcc/testsuite/gcc.target/arm/wmul-12.c 2011-10-19 14:42:50 +0000 +@@ -4,8 +4,8 @@ + long long + foo (int *b, int *c) + { +- int tmp = *b * *c; +- return 10 + (long long)tmp; ++ long long tmp = (long long)*b * *c; ++ return 10 + tmp; + } + + /* { dg-final { scan-assembler "smlal" } } */ + +=== modified file 'gcc/testsuite/gcc.target/arm/wmul-8.c' +--- old/gcc/testsuite/gcc.target/arm/wmul-8.c 2011-07-15 14:16:54 +0000 ++++ new/gcc/testsuite/gcc.target/arm/wmul-8.c 2011-10-19 14:42:50 +0000 +@@ -4,7 +4,7 @@ + long long + foo (long long a, int *b, int *c) + { +- return a + *b * *c; ++ return a + (long long)*b * *c; + } + + /* { dg-final { scan-assembler "smlal" } } */ + +=== modified file 'gcc/tree-ssa-math-opts.c' +--- old/gcc/tree-ssa-math-opts.c 2011-09-08 20:11:43 +0000 ++++ new/gcc/tree-ssa-math-opts.c 2011-10-19 14:42:50 +0000 +@@ -1351,10 +1351,12 @@ + and *TYPE2_OUT would give the operands of the multiplication. */ + + static bool +-is_widening_mult_p (tree type, gimple stmt, ++is_widening_mult_p (gimple stmt, + tree *type1_out, tree *rhs1_out, + tree *type2_out, tree *rhs2_out) + { ++ tree type = TREE_TYPE (gimple_assign_lhs (stmt)); ++ + if (TREE_CODE (type) != INTEGER_TYPE + && TREE_CODE (type) != FIXED_POINT_TYPE) + return false; +@@ -1416,7 +1418,7 @@ + if (TREE_CODE (type) != INTEGER_TYPE) + return false; + +- if (!is_widening_mult_p (type, stmt, &type1, &rhs1, &type2, &rhs2)) ++ if (!is_widening_mult_p (stmt, &type1, &rhs1, &type2, &rhs2)) + return false; + + to_mode = TYPE_MODE (type); +@@ -1592,7 +1594,7 @@ + if (code == PLUS_EXPR + && (rhs1_code == MULT_EXPR || rhs1_code == WIDEN_MULT_EXPR)) + { +- if (!is_widening_mult_p (type, rhs1_stmt, &type1, &mult_rhs1, ++ if (!is_widening_mult_p (rhs1_stmt, &type1, &mult_rhs1, + &type2, &mult_rhs2)) + return false; + add_rhs = rhs2; +@@ -1600,7 +1602,7 @@ + } + else if (rhs2_code == MULT_EXPR || rhs2_code == WIDEN_MULT_EXPR) + { +- if (!is_widening_mult_p (type, rhs2_stmt, &type1, &mult_rhs1, ++ if (!is_widening_mult_p (rhs2_stmt, &type1, &mult_rhs1, + &type2, &mult_rhs2)) + return false; + add_rhs = rhs1; + |