From: Thomas Koenig <tkoenig@gcc.gnu.org>
Date: Sat, 23 Mar 2019 16:01:57 +0000 (+0000)
Subject: re PR fortran/68009 (prototype for gfortran_runtime_error with inline matmul)
X-Git-Tag: releases/gcc-7.5.0~521
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=a75aba69e68b3796d9b802d008e27e72f17f3f86;p=thirdparty%2Fgcc.git

re PR fortran/68009 (prototype for gfortran_runtime_error with inline matmul)

2019-03-23  Thomas Koenig  <tkoeng@gcc.gnu.org>

    PR fortran/68009
    Backport from trunk
    * iresolve.c: Include trans.h.
    (gfc_resolve_fe_runtine_error): Set backend_decl on
    resolved_sym.

From-SVN: r269890
---

diff --git a/gcc/fortran/ChangeLog b/gcc/fortran/ChangeLog
index f2426344410c..67e0922adba0 100644
--- a/gcc/fortran/ChangeLog
+++ b/gcc/fortran/ChangeLog
@@ -1,3 +1,11 @@
+2019-03-23  Thomas Koenig  <tkoeng@gcc.gnu.org>
+
+	PR fortran/68009
+	Backport from trunk
+	* iresolve.c: Include trans.h.
+	(gfc_resolve_fe_runtine_error): Set backend_decl on
+	resolved_sym.
+
 2019-03-17  Thomas Koenig  <tkoenig@gcc.gnu.org>
 
 	PR fortran/84394
diff --git a/gcc/fortran/iresolve.c b/gcc/fortran/iresolve.c
index b784ac339e96..a5fcbda46aab 100644
--- a/gcc/fortran/iresolve.c
+++ b/gcc/fortran/iresolve.c
@@ -35,6 +35,7 @@ along with GCC; see the file COPYING3.  If not see
 #include "intrinsic.h"
 #include "constructor.h"
 #include "arith.h"
+#include "trans.h"
 
 /* Given printf-like arguments, return a stable version of the result string. 
 
@@ -2286,6 +2287,10 @@ gfc_resolve_fe_runtime_error (gfc_code *c)
     a->name = "%VAL";
 
   c->resolved_sym = gfc_get_intrinsic_sub_symbol (name);
+  /* We set the backend_decl here because runtime_error is a
+     variadic function and we would use the wrong calling
+     convention otherwise.  */
+  c->resolved_sym->backend_decl = gfor_fndecl_runtime_error;
 }
 
 void