Fix number of arguments parameter in Ada DEF_FUNCTION_TYPE_* (was: Merge current set of OpenACC changes from gomp-4_0-branch)

[Thomas Schwinge]

Hi!

On Thu, 15 Jan 2015 21:20:07 +0100, I wrote:
> In r219682, I have committed to trunk our current set of OpenACC changes,
> which we had prepared on gomp-4_0-branch.  [...]

>       gcc/ada/
>       * gcc-interface/utils.c (DEF_FUNCTION_TYPE_VAR_8)
>       (DEF_FUNCTION_TYPE_VAR_12): New macros.

Committed in r220910:

commit 11d2c7638e26ab69df7167474c9aa8f5d4114703
Author: tschwinge <tschwinge@138bc75d-0d04-0410-961f-82ee72b054a4>
Date:   Mon Feb 23 10:06:49 2015 +0000

    Fix number of arguments parameter in Ada DEF_FUNCTION_TYPE_*.
    
        gcc/ada/
        * gcc-interface/utils.c (DEF_FUNCTION_TYPE_VAR_8)
        (DEF_FUNCTION_TYPE_VAR_12): Fix number of arguments parameter.
    
    git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@220910 
138bc75d-0d04-0410-961f-82ee72b054a4
---
 gcc/ada/ChangeLog             |    5 +++++
 gcc/ada/gcc-interface/utils.c |    4 ++--
 2 files changed, 7 insertions(+), 2 deletions(-)

diff --git gcc/ada/ChangeLog gcc/ada/ChangeLog
index ddd6e10..06a51ac 100644
--- gcc/ada/ChangeLog
+++ gcc/ada/ChangeLog
@@ -1,3 +1,8 @@
+2015-02-23  Thomas Schwinge  <tho...@codesourcery.com>
+
+       * gcc-interface/utils.c (DEF_FUNCTION_TYPE_VAR_8)
+       (DEF_FUNCTION_TYPE_VAR_12): Fix number of arguments parameter.
+
 2015-02-22  Arnaud Charlet  <char...@adacore.com>
 
        * doc/Makefile: postprocess texinfo files to update @dircategory
diff --git gcc/ada/gcc-interface/utils.c gcc/ada/gcc-interface/utils.c
index 44dad7b..d076da7 100644
--- gcc/ada/gcc-interface/utils.c
+++ gcc/ada/gcc-interface/utils.c
@@ -5477,11 +5477,11 @@ install_builtin_function_types (void)
   def_fn_type (ENUM, RETURN, 1, 5, ARG1, ARG2, ARG3, ARG4, ARG5);
 #define DEF_FUNCTION_TYPE_VAR_8(ENUM, RETURN, ARG1, ARG2, ARG3, ARG4, ARG5, \
                                ARG6, ARG7, ARG8)                       \
-  def_fn_type (ENUM, RETURN, 1, 5, ARG1, ARG2, ARG3, ARG4, ARG5, ARG6, \
+  def_fn_type (ENUM, RETURN, 1, 8, ARG1, ARG2, ARG3, ARG4, ARG5, ARG6, \
               ARG7, ARG8);
 #define DEF_FUNCTION_TYPE_VAR_12(ENUM, RETURN, ARG1, ARG2, ARG3, ARG4, ARG5, \
                                 ARG6, ARG7, ARG8, ARG9, ARG10, ARG11, ARG12) \
-  def_fn_type (ENUM, RETURN, 1, 5, ARG1, ARG2, ARG3, ARG4, ARG5, ARG6, \
+  def_fn_type (ENUM, RETURN, 1, 12, ARG1, ARG2, ARG3, ARG4, ARG5, ARG6,        
\
               ARG7, ARG8, ARG9, ARG10, ARG11, ARG12);
 #define DEF_POINTER_TYPE(ENUM, TYPE) \
   builtin_types[(int) ENUM] = build_pointer_type (builtin_types[(int) TYPE]);


Grüße,
 Thomas

signature.asc
Description: PGP signature