diff mbox

Openacc launch API

Message ID 560BD78D.8010502@ubuntu.com
State New
Headers show

Commit Message

Matthias Klose Sept. 30, 2015, 12:37 p.m. UTC 
On 25.08.2015 15:29, Nathan Sidwell wrote:
> Jakub,
>
> This patch changes the launch API for openacc parallels.

this broke the jit build.

The following patch fixes the build for me. Ok to commit?

   Matthias

2015-09-30  Matthias Klose  <doko@ubuntu.com>

         * jit-builtins.h Define DEF_FUNCTION_TYPE_VAR_6,
         remove DEF_FUNCTION_TYPE_VAR_11.
         * jit-builtins.c (builtins_manager::make_type): Define and handle
         DEF_FUNCTION_TYPE_VAR_6, remove DEF_FUNCTION_TYPE_VAR_11.

Comments

Bernd Schmidt Sept. 30, 2015, 12:40 p.m. UTC | #1 
On 09/30/2015 02:37 PM, Matthias Klose wrote:
>
> this broke the jit build.
>
> The following patch fixes the build for me. Ok to commit?
>
>    Matthias
>
> 2015-09-30  Matthias Klose  <doko@ubuntu.com>
>
>          * jit-builtins.h Define DEF_FUNCTION_TYPE_VAR_6,
>          remove DEF_FUNCTION_TYPE_VAR_11.
>          * jit-builtins.c (builtins_manager::make_type): Define and handle
>          DEF_FUNCTION_TYPE_VAR_6, remove DEF_FUNCTION_TYPE_VAR_11.

Yeah, I think that qualifies as obvious.


Bernd
Matthias Klose Sept. 30, 2015, 12:43 p.m. UTC | #2 
On 30.09.2015 14:40, Bernd Schmidt wrote:
> On 09/30/2015 02:37 PM, Matthias Klose wrote:
>>
>> this broke the jit build.
>>
>> The following patch fixes the build for me. Ok to commit?
>>
>>    Matthias
>>
>> 2015-09-30  Matthias Klose  <doko@ubuntu.com>
>>
>>          * jit-builtins.h Define DEF_FUNCTION_TYPE_VAR_6,
>>          remove DEF_FUNCTION_TYPE_VAR_11.
>>          * jit-builtins.c (builtins_manager::make_type): Define and handle
>>          DEF_FUNCTION_TYPE_VAR_6, remove DEF_FUNCTION_TYPE_VAR_11.
>
> Yeah, I think that qualifies as obvious.

Ok, committed.
Nathan Sidwell Sept. 30, 2015, 12:49 p.m. UTC | #3 
On 09/30/15 08:37, Matthias Klose wrote:
> On 25.08.2015 15:29, Nathan Sidwell wrote:
>> Jakub,
>>
>> This patch changes the launch API for openacc parallels.
>
> this broke the jit build.
>
> The following patch fixes the build for me. Ok to commit?
>
>    Matthias
>
> 2015-09-30  Matthias Klose  <doko@ubuntu.com>
>
>          * jit-builtins.h Define DEF_FUNCTION_TYPE_VAR_6,
>          remove DEF_FUNCTION_TYPE_VAR_11.
>          * jit-builtins.c (builtins_manager::make_type): Define and handle
>          DEF_FUNCTION_TYPE_VAR_6, remove DEF_FUNCTION_TYPE_VAR_11.

Looks obvious to me.  Sorry for the breakage.


nathan
diff mbox

Patch

Index: gcc/jit/jit-builtins.c
===================================================================
--- gcc/jit/jit-builtins.c	(revision 228287)
+++ gcc/jit/jit-builtins.c	(working copy)
@@ -320,15 +320,14 @@ 
 #define DEF_FUNCTION_TYPE_VAR_5(ENUM, RETURN, ARG1, ARG2, ARG3, ARG4, ARG5) \
       case ENUM: return make_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)					\
+      case ENUM: return make_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)				\
       case ENUM: return make_fn_type (ENUM, RETURN, 1, 7, ARG1, ARG2, ARG3, \
 				      ARG4, ARG5, ARG6, ARG7);
-#define DEF_FUNCTION_TYPE_VAR_11(ENUM, RETURN, ARG1, ARG2, ARG3, ARG4, ARG5, \
-				 ARG6, ARG7, ARG8, ARG9, ARG10, ARG11) \
-      case ENUM: return make_fn_type (ENUM, RETURN, 1, 11, ARG1, ARG2, ARG3, \
-				      ARG4, ARG5, ARG6, ARG7, ARG8, ARG9, \
-				      ARG10, ARG11);
 #define DEF_POINTER_TYPE(ENUM, TYPE) \
       case ENUM: return make_ptr_type (ENUM, TYPE);
 
@@ -350,8 +349,8 @@ 
 #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_11
 #undef DEF_POINTER_TYPE
 
     default:
Index: gcc/jit/jit-builtins.h
===================================================================
--- gcc/jit/jit-builtins.h	(revision 228287)
+++ gcc/jit/jit-builtins.h	(working copy)
@@ -50,10 +50,10 @@ 
 #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_11(NAME, RETURN, ARG1, ARG2, ARG3, ARG4, ARG5, \
-				 ARG6, ARG7, ARG8, ARG9, ARG10, ARG11) NAME,
 #define DEF_POINTER_TYPE(NAME, TYPE) NAME,
 #include "builtin-types.def"
 #undef DEF_PRIMITIVE_TYPE
@@ -73,7 +73,6 @@ 
 #undef DEF_FUNCTION_TYPE_VAR_4
 #undef DEF_FUNCTION_TYPE_VAR_5
 #undef DEF_FUNCTION_TYPE_VAR_7
-#undef DEF_FUNCTION_TYPE_VAR_11
 #undef DEF_POINTER_TYPE
   BT_LAST
 }; /* enum jit_builtin_type */