This is the mail archive of the
fortran@gcc.gnu.org
mailing list for the GNU Fortran project.
Re: [Fortran-CAF][Fortran-DEV] Merge from the trunk into the branch
- From: Tobias Burnus <burnus at net-b dot de>
- To: gcc-patches <gcc-patches at gcc dot gnu dot org>, gfortran <fortran at gcc dot gnu dot org>
- Date: Wed, 11 Jun 2014 08:05:26 +0200
- Subject: Re: [Fortran-CAF][Fortran-DEV] Merge from the trunk into the branch
- Authentication-results: sourceware.org; auth=none
- References: <53975721 dot 7040101 at net-b dot de>
Tobias Burnus wrote:
I have merged the trunk into the Fortran-caf branch (as Rev. 211423)
and into the Fortran-dev branch (as Rev. 211427).
For fortran-dev, I had to fix a merge fallout, see attachment (committed
as Rev. 211435).
Tobias
Index: trans-openmp.c
===================================================================
--- trans-openmp.c (Revision 211427)
+++ trans-openmp.c (Arbeitskopie)
@@ -1090,7 +1090,7 @@ gfc_trans_omp_udr_expr (gfc_omp_namelist *n, bool
/* Enable loop reversal. */
for (i = 0; i < GFC_MAX_DIMENSIONS; i++)
loop.reverse[i] = GFC_ENABLE_REVERSE;
- gfc_conv_loop_setup (&loop, &ns->code->loc);
+ gfc_conv_loop_setup (&loop, &ns->code->loc, &syme->ts);
gfc_copy_loopinfo_to_se (&symse, &loop);
gfc_copy_loopinfo_to_se (&outerse, &loop);
symse.ss = symss;