Re: [fortran-dev] Merge from trunk

[Paul Richard Thomas <paul dot richard dot thomas at gmail dot com>]

Hi Tobias,

Thanks for doing that. I'll get on with the compile problem this morning.

Cheers

Paul

On 29 August 2016 at 23:36, Tobias Burnus <burnus@net-b.de> wrote:
> Dear all,
>
> I have merged parts from the trunk to the "fortran-dev" branch. (Motivated
> by a question from Paul.)
>
> * Previous version: r211744 (2014-06-17) – that was during the GCC 4.10
> (alias GCC 5) development.
>
> * New commit: r239808.
> Merged 6965 commits up to r222315 of 2015-05-22 – that's the trunk GCC when
> GCC 5.1 was released (i.e. a few weeks after GCC 6 stage 1 has started).
> [Conflicts resolved, but untested/not bootstrapped. (Failed to build because
> my system compiler and ISL were too new.)]
>
> * New commit: 239839
> Merged 7698 commits up to r235035 of 2016-04-15 – that's when GCC 6 was
> branched and GCC was set to 7.0.0.
> Conflicts resolved and attempted to build; some build errors fixed, some
> remaining. Additionally, there are some dg-* merge conflicts, whose
> resolution I deferred (see below).
>
> * New commit: 239846
> Merge up to today's trunk (r239841), resolved merge new conflicts
>
> STATUS:
> * Branch is up to date (it just misses the last two commits)
> * No merge conflicts, except for the listed test-suite files listed below
> * Does not yet compile as some functions changed (partially fixed but still
> more needs to be done)
>
> Cheers,
>
> Tobias
>
> PS: Somehow, "svn merge" takes ages to merge.
>
> PPS: The unresolved (!) merge conflicts in the test suite are:
> gcc/testsuite/gfortran.dg/array_section_2.f90
> gcc/testsuite/gfortran.dg/assumed_type_2.f90
> gcc/testsuite/gfortran.dg/class_allocate_14.f90
> gcc/testsuite/gfortran.dg/coarray_lib_this_image_2.f90
> gcc/testsuite/gfortran.dg/no_arg_check_2.f90
> gcc/testsuite/gfortran.dg/pr32921.f



-- 
The difference between genius and stupidity is; genius has its limits.

Albert Einstein