[Fortran-Experiments] Merge to r120360

Christopher D. Rickett crickett@lanl.gov
Wed Feb 21 22:12:00 GMT 2007


there were also conflicts with decl.c and bind_c_usage_3.f03, but they 
seemed to be just whitespace again.  there was also a problem with the 
merge for match.c, but it didn't report any conflict.  it duplicated some 
of the code.  i've removed it and now the results of svn diff look as i'd 
expect.

i'm bootstrapping now.  i'll submit my patch if it builds and regtests 
fine.

Chris

On Wed, 21 Feb 2007, Christopher D. Rickett wrote:

>
>
>>> 
>> Yes, the big one: http://gcc.gnu.org/ml/fortran/2007-02/msg00440.html
>> which still cleanly applies and a tiny one which does not:
>> http://gcc.gnu.org/ml/fortran/2007-02/msg00135.html
>> 
>
> i just did an update, and i had conflicts with symbol.c.  i think i've fixed 
> them though.  i can't tell why it got confused in some of the places because 
> the code looks the same, except for whitespace.  i'll bootstrap and regtest 
> and submit another patch.
>
> thanks for getting the branch updated.
> Chris
>
>



More information about the Fortran mailing list