[dataflow]: PATCH committed to fix merge.

[Kenneth Zadeck]

All of these are obvious changes. 

This makes danny's merge from last night bootstrap on x86-64, x86-32,
ppc-32 and ia-64.

With this patch, the merge is clean on ia-64.  There is one regression
that has come back on x86-64. 
gcc.dg/torture/fp-int-convert-float128-timode.c.  I suspect that this is
a merge problem since the bug was fixed after the last merge also but i
need to look into it.

the regression tests are not finished on x86-32 and ppc.

2007-06-07  Kenneth Zadeck <zadeck@naturalbridge.com>

    * emit-rtl.c (set_insn_deleted): Changed NOTE_LINE_NUMBER to
    NOTE_KIND.
    (emit_note_after): Fixed merge glitch.
    * combine.c (try_combine):  Changed NOTE_LINE_NUMBER to
    NOTE_KIND.
    * reg-stack.c (convert_regs_1): Fixed merge glitch.
    * config/rs6000/rs6000.c (no_global_regs_above): Fixed merge typo.
    (rs6000_emit_prologue): Fixed merge glitch.

Kenny


-------------- next part --------------
A non-text attachment was scrubbed...
Name: merge2.diff
Type: text/x-patch
Size: 4091 bytes
Desc: not available
URL: <http://gcc.gnu.org/pipermail/gcc-patches/attachments/20070607/7f1b0889/attachment.bin>