Merge branch 'master' into devel/coarray_native

diff --cc gcc/flag-types.h
Simple merge

diff --cc gcc/fortran/dump-parse-tree.c
Simple merge

diff --cc gcc/fortran/gfortran.h
Simple merge

diff --cc gcc/fortran/lang.opt
Simple merge

diff --cc gcc/fortran/options.c
Simple merge

diff --cc gcc/fortran/resolve.c
index 106df27416a4c7790c9994c80ce3484277aa5a23,249f402b8d93590897faf1c0c220f5a443bcbee9..a2898bf45455851b86d373be217cc8b53d1dea7b
--- 1/gcc/fortran/resolve.c
--- 2/gcc/fortran/resolve.c
+++ b/gcc/fortran/resolve.c
@@@ -3795,9 -3752,12 +3800,14 @@@ resolve_call (gfc_code *c
      /* Typebound procedure: Assume the worst.  */
      gfc_current_ns->proc_name->attr.array_outer_dependency = 1;
  
 -
 +  if (flag_coarray == GFC_FCOARRAY_SHARED)
 +    fixup_shared_coarray_args (csym, c->ext.actual);
 +
+   if (c->resolved_sym
+       && c->resolved_sym->attr.ext_attr & (1 << EXT_ATTR_DEPRECATED))
+     gfc_warning (OPT_Wdeprecated_declarations,
+                "Using subroutine %qs at %L is deprecated",
+                c->resolved_sym->name, &c->loc);
    return t;
  }
  

diff --cc gcc/fortran/trans-array.c
index 998ec959402e430dc25d404d5a11449f289cadf2,33e05be5bd1838eca22d96abe55dc2407de3d9dd..199bcaed9b123f6761dbbf14ad2c12e1f6d92473
--- 1/gcc/fortran/trans-array.c
--- 2/gcc/fortran/trans-array.c
+++ b/gcc/fortran/trans-array.c
@@@ -3074,10 -3071,12 +3156,13 @@@ gfc_conv_ss_descriptor (stmtblock_t * b
           Otherwise we must evaluate it now to avoid breaking dependency
         analysis by pulling the expressions for elemental array indices
         inside the loop.  */
 +
        if (!(DECL_P (tmp)
            || (TREE_CODE (tmp) == ADDR_EXPR
-               && DECL_P (TREE_OPERAND (tmp, 0)))))
+               && DECL_P (TREE_OPERAND (tmp, 0)))
+           || (GFC_DESCRIPTOR_TYPE_P (TREE_TYPE (se.expr))
+               && TREE_CODE (se.expr) == COMPONENT_REF
+               && GFC_CLASS_TYPE_P (TREE_TYPE (TREE_OPERAND (se.expr, 0))))))
        tmp = gfc_evaluate_now (tmp, block);
        info->data = tmp;
  

diff --cc gcc/fortran/trans-decl.c
Simple merge

diff --cc gcc/fortran/trans-expr.c
Simple merge

diff --cc gcc/fortran/trans-intrinsic.c
index 912c9b03a749198a475ffd314da3920701ab1f00,bcc13ce79c625fed9d2ff91ee0969fdb3535b443..13c32957d6982d08e947fb4245fd5bde75e668dd
--- 1/gcc/fortran/trans-intrinsic.c
--- 2/gcc/fortran/trans-intrinsic.c
+++ b/gcc/fortran/trans-intrinsic.c
@@@ -40,8 -40,9 +40,10 @@@ along with GCC; see the file COPYING3
  #include "trans-types.h"
  #include "trans-array.h"
  #include "dependency.h"       /* For CAF array alias analysis.  */
+ #include "attribs.h"
+ 
  /* Only for gfc_trans_assign and gfc_trans_pointer_assign.  */
 +#include "trans-stmt.h"
  
  /* This maps Fortran intrinsic math functions to external library or GCC
     builtin functions.  */

diff --cc gcc/fortran/trans-stmt.c
Simple merge

diff --cc gcc/fortran/trans-types.c
Simple merge

diff --cc gcc/fortran/trans.c
Simple merge

diff --cc gcc/fortran/trans.h
Simple merge

diff --cc libgfortran/configure
Simple merge

diff --cc libgfortran/libgfortran.h
Simple merge