| Message ID | 1370963798.28429.16.camel@surprise |
|---|---|
| State | New |
| Headers | show |
On 06/11/13 09:16, David Malcolm wrote: > > 2013-06-11 David Malcolm <dmalcolm@redhat.com> > > * function.c (initial_trampoline): Remove stray copy; see > varasm.c for the real copy. This is fine. However, I'd just make the ChangeLog * function.c (initial_trampoline): Remove stray copy. Jeff
On Tue, 2013-06-11 at 09:56 -0600, Jeff Law wrote: > On 06/11/13 09:16, David Malcolm wrote: > > > > 2013-06-11 David Malcolm <dmalcolm@redhat.com> > > > > * function.c (initial_trampoline): Remove stray copy; see > > varasm.c for the real copy. > This is fine. However, I'd just make the ChangeLog > > * function.c (initial_trampoline): Remove stray copy. Thanks; committed to svn trunk with the above ChangeLog as r199962.
Index: gcc/function.c =================================================================== --- gcc/function.c (revision 199957) +++ gcc/function.c (working copy) @@ -4980,8 +4980,6 @@ warning (OPT_Wunused_parameter, "unused parameter %q+D", decl); } -static GTY(()) rtx initial_trampoline; - /* Generate RTL for the end of the current function. */ void
Both function.c and varasm.c contain their own copies of this declaration: static GTY(()) rtx initial_trampoline; Only the one in varasm.c is used; the one in function.c appears to be a missing removal from this move: 2004-05-13 Diego Novillo <dnovillo@redhat.com> Merge from tree-ssa-20020619-branch. (...snip...) * function.c (...snip...) (initial_trampoline): Move to varasm.c. * varasm.c (...snip...) (initial_trampoline): Move from function.c. as part of this commit on that branch: 2004-02-16 Richard Henderson <rth@redhat.com> * tree-nested.c: New file. (...snip...) (I'm not sure if the error occurred on the branch or during merger). I'm attaching a patch to remove the stray copy from function.c Successfully bootstrapped on x86_64-unknown-linux-gnu OK for trunk? 2013-06-11 David Malcolm <dmalcolm@redhat.com> * function.c (initial_trampoline): Remove stray copy; see varasm.c for the real copy.