Patchwork [gcc-4_7-branch] Backport trunk revision 187838 into gcc-4_7-branch

login
register
mail settings
Submitter Chung-Ju Wu
Date May 9, 2013, 3:41 a.m.
Message ID <CADj25HP5NjZ5bHmmwx3aVRUNcHe+L9Q9r-Dch+mdnxVUQpko1Q@mail.gmail.com>
Download mbox | patch
Permalink /patch/242706/
State New
Headers show

Comments

Chung-Ju Wu - May 9, 2013, 3:41 a.m.
Hi, all,

There was a patch to remove libgcc_tm.stamp when developers
manually issue "make clean-target-libgcc" (under top-level build folder)
or "make clean" (under BUILD-FOLDER/TARGET/libgcc).

Without that patch, we cannot successfully do
"make all-target-libgcc" again due to that we
remove libgcc_tm.h but not libgcc_tm.stamp.
It would complain nonexistence of libgcc_tm.h
during the libgcc building process:

  fatal error: libgcc_tm.h: No such file or directory


According to the discussion thread last year,
I thought it has been committed into gcc-4_7-branch:

  http://gcc.gnu.org/ml/gcc-patches/2012-05/msg01630.html
  http://gcc.gnu.org/ml/gcc-patches/2012-05/msg01636.html

But by checking out 4.7 branch repository, I notice that it is only
committed into the trunk (r187838) on that time.
Since gcc-4_7-branch is still open and there will be 4.7.4 release,
is it OK to backport r187838 into gcc-4_7-branch?


libgcc/ChangeLog

2013-05-09  Chung-Ju Wu  <jasonwucj@gmail.com>

    Backport from mainline
    2012-05-24  Olivier Hainque  <hainque@adacore.com>

    * Makefile.in (clean): Remove libgcc_tm.stamp as well.
    Use a separate command for stamp removals.




Best regards,
jasonwucj
Chung-Ju Wu - May 18, 2013, 2:29 a.m.
Ping: http://gcc.gnu.org/ml/gcc-patches/2013-05/msg00429.html

The patch is to fix dependency issue of libgcc Makefile.in
by adding 'rm libgcc_tm.stamp' in the clean rule.

That was fixed on main trunk (r187838) but not on gcc-4_7-branch.
Since gcc-4_7-branch is still open, is it OK to backport r187838
into gcc-4_7-branch?


Best regards,
jasonwucj
Ian Taylor - May 19, 2013, 4:10 a.m.
On Fri, May 17, 2013 at 7:29 PM, Chung-Ju Wu <jasonwucj@gmail.com> wrote:
> Ping: http://gcc.gnu.org/ml/gcc-patches/2013-05/msg00429.html
>
> The patch is to fix dependency issue of libgcc Makefile.in
> by adding 'rm libgcc_tm.stamp' in the clean rule.
>
> That was fixed on main trunk (r187838) but not on gcc-4_7-branch.
> Since gcc-4_7-branch is still open, is it OK to backport r187838
> into gcc-4_7-branch?

It's OK with me but in general I think the release managers need to
approve backports.

Ian
Chung-Ju Wu - May 19, 2013, 7:26 a.m.
2013/5/19 Ian Lance Taylor <iant@google.com>:
> On Fri, May 17, 2013 at 7:29 PM, Chung-Ju Wu <jasonwucj@gmail.com> wrote:
>> Ping: http://gcc.gnu.org/ml/gcc-patches/2013-05/msg00429.html
>>
>> The patch is to fix dependency issue of libgcc Makefile.in
>> by adding 'rm libgcc_tm.stamp' in the clean rule.
>>
>> That was fixed on main trunk (r187838) but not on gcc-4_7-branch.
>> Since gcc-4_7-branch is still open, is it OK to backport r187838
>> into gcc-4_7-branch?
>
> It's OK with me but in general I think the release managers need to
> approve backports.
>
> Ian

Thanks Ian's approval for the libgcc part.

Hi, Richard, here is the mail for my patch:
  http://gcc.gnu.org/ml/gcc-patches/2013-05/msg00429.html

The patch doesn't add any new feature to gcc-4_7-branch.
It just fixes the dependency issue in libgcc Makefile.in.

Is it OK to do backport?


Best regards,
jasonwucj
Paolo Bonzini - May 19, 2013, 2:32 p.m.
Il 18/05/2013 04:29, Chung-Ju Wu ha scritto:
> Ping: http://gcc.gnu.org/ml/gcc-patches/2013-05/msg00429.html
> 
> The patch is to fix dependency issue of libgcc Makefile.in
> by adding 'rm libgcc_tm.stamp' in the clean rule.
> 
> That was fixed on main trunk (r187838) but not on gcc-4_7-branch.
> Since gcc-4_7-branch is still open, is it OK to backport r187838
> into gcc-4_7-branch?

It's trivial enough that you can go ahead and backport it.

Thanks!

Paolo
Chung-Ju Wu - May 20, 2013, 3:59 a.m.
2013/5/19 Paolo Bonzini <bonzini@gnu.org>:
> Il 18/05/2013 04:29, Chung-Ju Wu ha scritto:
>> Ping: http://gcc.gnu.org/ml/gcc-patches/2013-05/msg00429.html
>>
>> The patch is to fix dependency issue of libgcc Makefile.in
>> by adding 'rm libgcc_tm.stamp' in the clean rule.
>>
>> That was fixed on main trunk (r187838) but not on gcc-4_7-branch.
>> Since gcc-4_7-branch is still open, is it OK to backport r187838
>> into gcc-4_7-branch?
>
> It's trivial enough that you can go ahead and backport it.
>
> Thanks!
>
> Paolo

Thanks for both Ian and Paolo's approval. :)

Committed into gcc-4_7-branch as Rev.199091.


Best regards,
jasonwucj
Richard Guenther - May 21, 2013, 7:50 a.m.
On Sun, 19 May 2013, Chung-Ju Wu wrote:

> 2013/5/19 Ian Lance Taylor <iant@google.com>:
> > On Fri, May 17, 2013 at 7:29 PM, Chung-Ju Wu <jasonwucj@gmail.com> wrote:
> >> Ping: http://gcc.gnu.org/ml/gcc-patches/2013-05/msg00429.html
> >>
> >> The patch is to fix dependency issue of libgcc Makefile.in
> >> by adding 'rm libgcc_tm.stamp' in the clean rule.
> >>
> >> That was fixed on main trunk (r187838) but not on gcc-4_7-branch.
> >> Since gcc-4_7-branch is still open, is it OK to backport r187838
> >> into gcc-4_7-branch?
> >
> > It's OK with me but in general I think the release managers need to
> > approve backports.
> >
> > Ian
> 
> Thanks Ian's approval for the libgcc part.
> 
> Hi, Richard, here is the mail for my patch:
>   http://gcc.gnu.org/ml/gcc-patches/2013-05/msg00429.html
> 
> The patch doesn't add any new feature to gcc-4_7-branch.
> It just fixes the dependency issue in libgcc Makefile.in.
> 
> Is it OK to do backport?

Ok.

Thanks,
Richard.

Patch

Index: libgcc/Makefile.in
===================================================================
--- libgcc/Makefile.in  (revision 198729)
+++ libgcc/Makefile.in  (working copy)
@@ -121,7 +121,8 @@ 
 .PHONY: all clean

 clean:
-       -rm -f config.h libgcc_tm.h stamp-h stmp-ldirs libgcc.map
+       -rm -f config.h libgcc_tm.h libgcc.map
+       -rm -f libgcc_tm.stamp stamp-h stmp-ldirs
        -rm -f *$(objext)
        -rm -f *.dep
        -rm -f *.a