diff options
Diffstat (limited to 'toolchain-layer/recipes-devtools/gcc/gcc-4.6/linaro/gcc-4.6-linaro-r106814.patch')
| -rw-r--r-- | toolchain-layer/recipes-devtools/gcc/gcc-4.6/linaro/gcc-4.6-linaro-r106814.patch | 80 |
1 files changed, 0 insertions, 80 deletions
diff --git a/toolchain-layer/recipes-devtools/gcc/gcc-4.6/linaro/gcc-4.6-linaro-r106814.patch b/toolchain-layer/recipes-devtools/gcc/gcc-4.6/linaro/gcc-4.6-linaro-r106814.patch deleted file mode 100644 index 91b2191cb8..0000000000 --- a/toolchain-layer/recipes-devtools/gcc/gcc-4.6/linaro/gcc-4.6-linaro-r106814.patch +++ /dev/null | |||
| @@ -1,80 +0,0 @@ | |||
| 1 | 2011-09-22 Revital Eres <revital.eres@linaro.org> | ||
| 2 | |||
| 3 | gcc/ | ||
| 4 | Backport from trunk -r178804: | ||
| 5 | modulo-sched.c (remove_node_from_ps): Return void | ||
| 6 | instead of bool. | ||
| 7 | (optimize_sc): Adjust call to remove_node_from_ps. | ||
| 8 | (sms_schedule): Add print info. | ||
| 9 | |||
| 10 | === modified file 'gcc/modulo-sched.c' | ||
| 11 | --- old/gcc/modulo-sched.c 2011-08-09 04:51:48 +0000 | ||
| 12 | +++ new/gcc/modulo-sched.c 2011-09-14 11:06:06 +0000 | ||
| 13 | @@ -211,7 +211,7 @@ | ||
| 14 | static bool try_scheduling_node_in_cycle (partial_schedule_ptr, ddg_node_ptr, | ||
| 15 | int, int, sbitmap, int *, sbitmap, | ||
| 16 | sbitmap); | ||
| 17 | -static bool remove_node_from_ps (partial_schedule_ptr, ps_insn_ptr); | ||
| 18 | +static void remove_node_from_ps (partial_schedule_ptr, ps_insn_ptr); | ||
| 19 | |||
| 20 | #define SCHED_ASAP(x) (((node_sched_params_ptr)(x)->aux.info)->asap) | ||
| 21 | #define SCHED_TIME(x) (((node_sched_params_ptr)(x)->aux.info)->time) | ||
| 22 | @@ -834,8 +834,7 @@ | ||
| 23 | if (next_ps_i->node->cuid == g->closing_branch->cuid) | ||
| 24 | break; | ||
| 25 | |||
| 26 | - gcc_assert (next_ps_i); | ||
| 27 | - gcc_assert (remove_node_from_ps (ps, next_ps_i)); | ||
| 28 | + remove_node_from_ps (ps, next_ps_i); | ||
| 29 | success = | ||
| 30 | try_scheduling_node_in_cycle (ps, g->closing_branch, | ||
| 31 | g->closing_branch->cuid, c, | ||
| 32 | @@ -1485,8 +1484,8 @@ | ||
| 33 | if (dump_file) | ||
| 34 | { | ||
| 35 | fprintf (dump_file, | ||
| 36 | - "SMS succeeded %d %d (with ii, sc)\n", ps->ii, | ||
| 37 | - stage_count); | ||
| 38 | + "%s:%d SMS succeeded %d %d (with ii, sc)\n", | ||
| 39 | + insn_file (tail), insn_line (tail), ps->ii, stage_count); | ||
| 40 | print_partial_schedule (ps, dump_file); | ||
| 41 | } | ||
| 42 | |||
| 43 | @@ -2810,22 +2809,18 @@ | ||
| 44 | } | ||
| 45 | |||
| 46 | |||
| 47 | -/* Removes the given PS_INSN from the partial schedule. Returns false if the | ||
| 48 | - node is not found in the partial schedule, else returns true. */ | ||
| 49 | -static bool | ||
| 50 | +/* Removes the given PS_INSN from the partial schedule. */ | ||
| 51 | +static void | ||
| 52 | remove_node_from_ps (partial_schedule_ptr ps, ps_insn_ptr ps_i) | ||
| 53 | { | ||
| 54 | int row; | ||
| 55 | |||
| 56 | - if (!ps || !ps_i) | ||
| 57 | - return false; | ||
| 58 | - | ||
| 59 | + gcc_assert (ps && ps_i); | ||
| 60 | + | ||
| 61 | row = SMODULO (ps_i->cycle, ps->ii); | ||
| 62 | if (! ps_i->prev_in_row) | ||
| 63 | { | ||
| 64 | - if (ps_i != ps->rows[row]) | ||
| 65 | - return false; | ||
| 66 | - | ||
| 67 | + gcc_assert (ps_i == ps->rows[row]); | ||
| 68 | ps->rows[row] = ps_i->next_in_row; | ||
| 69 | if (ps->rows[row]) | ||
| 70 | ps->rows[row]->prev_in_row = NULL; | ||
| 71 | @@ -2839,7 +2834,7 @@ | ||
| 72 | |||
| 73 | ps->rows_length[row] -= 1; | ||
| 74 | free (ps_i); | ||
| 75 | - return true; | ||
| 76 | + return; | ||
| 77 | } | ||
| 78 | |||
| 79 | /* Unlike what literature describes for modulo scheduling (which focuses | ||
| 80 | |||
