Re: [gomp4] expunge shared_size from launch API

[Tom de Vries <Tom_deVries@mentor.com>]

[-- Attachment #1: Type: text/plain, Size: 2116 bytes --]

On 01-09-15 12:15, Tom de Vries wrote:
> On 31/08/15 19:39, Nathan Sidwell wrote:
>>     * builtin-types.def (DEF_FUNCTION_TYPE_VAR_6): Define.
>
> Committed attached follow-up patch to fix the ada build.
>
> Thanks,
> - Tom
>
>
>
> 0001-Fix-gomp-4_0-branch-ada-build.patch
>
>
> Fix gomp-4_0-branch ada build
>
> 2015-09-01  Tom de Vries<tom@codesourcery.com>
>
> 	* gcc-interface/utils.c (DEF_FUNCTION_TYPE_VAR_6): Define.
> ---
>   gcc/ada/gcc-interface/utils.c | 7 +++++++
>   1 file changed, 7 insertions(+)
>
> diff --git a/gcc/ada/gcc-interface/utils.c b/gcc/ada/gcc-interface/utils.c
> index 66ba904..e32a539 100644
> --- a/gcc/ada/gcc-interface/utils.c
> +++ b/gcc/ada/gcc-interface/utils.c
> @@ -5376,6 +5376,8 @@ enum c_builtin_type
>   #define DEF_FUNCTION_TYPE_VAR_4(NAME, RETURN, ARG1, ARG2, ARG3, ARG4) NAME,
>   #define DEF_FUNCTION_TYPE_VAR_5(NAME, RETURN, ARG1, ARG2, ARG3, ARG4, ARG5) \
>   				NAME,
> +#define DEF_FUNCTION_TYPE_VAR_6(NAME, RETURN, ARG1, ARG2, ARG3, ARG4, ARG5, \
> +				ARG6) NAME,
>   #define DEF_FUNCTION_TYPE_VAR_7(NAME, RETURN, ARG1, ARG2, ARG3, ARG4, ARG5, \
>   				ARG6, ARG7) NAME,
>   #define DEF_FUNCTION_TYPE_VAR_12(NAME, RETURN, ARG1, ARG2, ARG3, ARG4, ARG5, \
> @@ -5399,6 +5401,7 @@ enum c_builtin_type
>   #undef DEF_FUNCTION_TYPE_VAR_3
>   #undef DEF_FUNCTION_TYPE_VAR_4
>   #undef DEF_FUNCTION_TYPE_VAR_5
> +#undef DEF_FUNCTION_TYPE_VAR_6
>   #undef DEF_FUNCTION_TYPE_VAR_7
>   #undef DEF_FUNCTION_TYPE_VAR_12
>   #undef DEF_POINTER_TYPE
> @@ -5506,6 +5509,9 @@ install_builtin_function_types (void)
>     def_fn_type (ENUM, RETURN, 1, 4, ARG1, ARG2, ARG3, ARG4);
>   #define DEF_FUNCTION_TYPE_VAR_5(ENUM, RETURN, ARG1, ARG2, ARG3, ARG4, ARG5) \
>     def_fn_type (ENUM, RETURN, 1, 5, ARG1, ARG2, ARG3, ARG4, ARG5);
> +#define DEF_FUNCTION_TYPE_VAR_6(ENUM, RETURN, ARG1, ARG2, ARG3, ARG4, ARG5, \
> +				ARG6)				\
> +  def_fn_type (ENUM, RETURN, 1, 7, ARG1, ARG2, ARG3, ARG4, ARG5, ARG6);

And of course, the argument for the 'n' parameter of def_fn_type should be '6' 
for DEF_FUNCTION_TYPE_VAR_6, not '7'.

Fixed in attached patch, committed.

Thanks,
- Tom

[-- Attachment #2: 0001-Fix-DEF_FUNCTION_TYPE_VAR_6-in-install_builtin_funct.patch --]
[-- Type: text/x-patch, Size: 1037 bytes --]

Fix DEF_FUNCTION_TYPE_VAR_6 in install_builtin_function_types

2015-09-02  Tom de Vries  <tom@codesourcery.com>

	* gcc-interface/utils.c (DEF_FUNCTION_TYPE_VAR_6): Fix define in
	install_builtin_function_types
---
 gcc/ada/gcc-interface/utils.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/gcc/ada/gcc-interface/utils.c b/gcc/ada/gcc-interface/utils.c
index e32a539..2ffc436 100644
--- a/gcc/ada/gcc-interface/utils.c
+++ b/gcc/ada/gcc-interface/utils.c
@@ -5511,7 +5511,7 @@ install_builtin_function_types (void)
   def_fn_type (ENUM, RETURN, 1, 5, ARG1, ARG2, ARG3, ARG4, ARG5);
 #define DEF_FUNCTION_TYPE_VAR_6(ENUM, RETURN, ARG1, ARG2, ARG3, ARG4, ARG5, \
 				ARG6)				\
-  def_fn_type (ENUM, RETURN, 1, 7, ARG1, ARG2, ARG3, ARG4, ARG5, ARG6);
+  def_fn_type (ENUM, RETURN, 1, 6, ARG1, ARG2, ARG3, ARG4, ARG5, ARG6);
 #define DEF_FUNCTION_TYPE_VAR_7(ENUM, RETURN, ARG1, ARG2, ARG3, ARG4, ARG5, \
 				ARG6, ARG7)				\
   def_fn_type (ENUM, RETURN, 1, 7, ARG1, ARG2, ARG3, ARG4, ARG5, ARG6, ARG7);
-- 
1.9.1