Fix broken build for AVR and SPU targets

Message ID 20140212081338.GA767@atmel.com
State New
Headers show

Commit Message

Senthil Kumar Selvaraj Feb. 12, 2014, 8:13 a.m.
The below patch fixes the build for AVR and SPU targets, which got broken
when the signature of build_function_call_vec changed. The patch passes
vNULL for the extra parameter added (arg_loc), which I hope is ok for
builtins?

If ok, could someone commit please? I don't have commit access.

Regards
Senthil

gcc/ChangeLog

2014-02-12  Senthil Kumar Selvaraj  <senthil_kumar.selvaraj@atmel.com>

	* config/avr/avr-c.c (avr_resolve_overloaded_builtin): Pass vNULL for arg_loc.
	* config/spu/spu-c.c (spu_resolve_overloaded_builtin): Likewise.

Comments

Marek Polacek Feb. 12, 2014, 9:16 a.m. | #1
On Wed, Feb 12, 2014 at 01:43:39PM +0530, Senthil Kumar Selvaraj wrote:
> The below patch fixes the build for AVR and SPU targets, which got broken
> when the signature of build_function_call_vec changed. The patch passes
> vNULL for the extra parameter added (arg_loc), which I hope is ok for
> builtins?

Sorry.
 
> If ok, could someone commit please? I don't have commit access.

I can commit it for you, if someone acks it (looks obvious enough to
me...).
 
> Regards
> Senthil
> 
> gcc/ChangeLog
> 
> 2014-02-12  Senthil Kumar Selvaraj  <senthil_kumar.selvaraj@atmel.com>
> 
> 	* config/avr/avr-c.c (avr_resolve_overloaded_builtin): Pass vNULL for arg_loc.
> 	* config/spu/spu-c.c (spu_resolve_overloaded_builtin): Likewise.
> 
> 
> diff --git gcc/config/avr/avr-c.c gcc/config/avr/avr-c.c
> index 98650e0..101d280 100644
> --- gcc/config/avr/avr-c.c
> +++ gcc/config/avr/avr-c.c
> @@ -115,7 +115,7 @@ avr_resolve_overloaded_builtin (unsigned int iloc, tree fndecl, void *vargs)
>        fold = targetm.builtin_decl (id, true);
>  
>        if (fold != error_mark_node)
> -        fold = build_function_call_vec (loc, fold, &args, NULL);
> +        fold = build_function_call_vec (loc, vNULL, fold, &args, NULL);
>  
>        break; // absfx
>  
> @@ -181,7 +181,7 @@ avr_resolve_overloaded_builtin (unsigned int iloc, tree fndecl, void *vargs)
>        fold = targetm.builtin_decl (id, true);
>  
>        if (fold != error_mark_node)
> -        fold = build_function_call_vec (loc, fold, &args, NULL);
> +        fold = build_function_call_vec (loc, vNULL, fold, &args, NULL);
>  
>        break; // roundfx
>  
> @@ -238,7 +238,7 @@ avr_resolve_overloaded_builtin (unsigned int iloc, tree fndecl, void *vargs)
>        fold = targetm.builtin_decl (id, true);
>  
>        if (fold != error_mark_node)
> -        fold = build_function_call_vec (loc, fold, &args, NULL);
> +        fold = build_function_call_vec (loc, vNULL, fold, &args, NULL);
>  
>        break; // countlsfx
>      }
> diff --git gcc/config/spu/spu-c.c gcc/config/spu/spu-c.c
> index 411496d..9d7aa5a 100644
> --- gcc/config/spu/spu-c.c
> +++ gcc/config/spu/spu-c.c
> @@ -181,7 +181,7 @@ spu_resolve_overloaded_builtin (location_t loc, tree fndecl, void *passed_args)
>        return error_mark_node;
>      }
>  
> -  return build_function_call_vec (loc, match, fnargs, NULL);
> +  return build_function_call_vec (loc, vNULL, match, fnargs, NULL);
>  #undef SCALAR_TYPE_P
>  }
>  

	Marek
Jakub Jelinek Feb. 12, 2014, 9:18 a.m. | #2
On Wed, Feb 12, 2014 at 10:16:37AM +0100, Marek Polacek wrote:
> On Wed, Feb 12, 2014 at 01:43:39PM +0530, Senthil Kumar Selvaraj wrote:
> > The below patch fixes the build for AVR and SPU targets, which got broken
> > when the signature of build_function_call_vec changed. The patch passes
> > vNULL for the extra parameter added (arg_loc), which I hope is ok for
> > builtins?
> 
> Sorry.
>  
> > If ok, could someone commit please? I don't have commit access.
> 
> I can commit it for you, if someone acks it (looks obvious enough to
> me...).

Ok for trunk.

> > 2014-02-12  Senthil Kumar Selvaraj  <senthil_kumar.selvaraj@atmel.com>
> > 
> > 	* config/avr/avr-c.c (avr_resolve_overloaded_builtin): Pass vNULL for arg_loc.
> > 	* config/spu/spu-c.c (spu_resolve_overloaded_builtin): Likewise.
> > 
> > 
> > diff --git gcc/config/avr/avr-c.c gcc/config/avr/avr-c.c
> > index 98650e0..101d280 100644
> > --- gcc/config/avr/avr-c.c
> > +++ gcc/config/avr/avr-c.c
> > @@ -115,7 +115,7 @@ avr_resolve_overloaded_builtin (unsigned int iloc, tree fndecl, void *vargs)
> >        fold = targetm.builtin_decl (id, true);
> >  
> >        if (fold != error_mark_node)
> > -        fold = build_function_call_vec (loc, fold, &args, NULL);
> > +        fold = build_function_call_vec (loc, vNULL, fold, &args, NULL);
> >  
> >        break; // absfx
> >  
> > @@ -181,7 +181,7 @@ avr_resolve_overloaded_builtin (unsigned int iloc, tree fndecl, void *vargs)
> >        fold = targetm.builtin_decl (id, true);
> >  
> >        if (fold != error_mark_node)
> > -        fold = build_function_call_vec (loc, fold, &args, NULL);
> > +        fold = build_function_call_vec (loc, vNULL, fold, &args, NULL);
> >  
> >        break; // roundfx
> >  
> > @@ -238,7 +238,7 @@ avr_resolve_overloaded_builtin (unsigned int iloc, tree fndecl, void *vargs)
> >        fold = targetm.builtin_decl (id, true);
> >  
> >        if (fold != error_mark_node)
> > -        fold = build_function_call_vec (loc, fold, &args, NULL);
> > +        fold = build_function_call_vec (loc, vNULL, fold, &args, NULL);
> >  
> >        break; // countlsfx
> >      }
> > diff --git gcc/config/spu/spu-c.c gcc/config/spu/spu-c.c
> > index 411496d..9d7aa5a 100644
> > --- gcc/config/spu/spu-c.c
> > +++ gcc/config/spu/spu-c.c
> > @@ -181,7 +181,7 @@ spu_resolve_overloaded_builtin (location_t loc, tree fndecl, void *passed_args)
> >        return error_mark_node;
> >      }
> >  
> > -  return build_function_call_vec (loc, match, fnargs, NULL);
> > +  return build_function_call_vec (loc, vNULL, match, fnargs, NULL);
> >  #undef SCALAR_TYPE_P
> >  }
> >  
> 
> 	Marek

	Jakub

Patch

diff --git gcc/config/avr/avr-c.c gcc/config/avr/avr-c.c
index 98650e0..101d280 100644
--- gcc/config/avr/avr-c.c
+++ gcc/config/avr/avr-c.c
@@ -115,7 +115,7 @@  avr_resolve_overloaded_builtin (unsigned int iloc, tree fndecl, void *vargs)
       fold = targetm.builtin_decl (id, true);
 
       if (fold != error_mark_node)
-        fold = build_function_call_vec (loc, fold, &args, NULL);
+        fold = build_function_call_vec (loc, vNULL, fold, &args, NULL);
 
       break; // absfx
 
@@ -181,7 +181,7 @@  avr_resolve_overloaded_builtin (unsigned int iloc, tree fndecl, void *vargs)
       fold = targetm.builtin_decl (id, true);
 
       if (fold != error_mark_node)
-        fold = build_function_call_vec (loc, fold, &args, NULL);
+        fold = build_function_call_vec (loc, vNULL, fold, &args, NULL);
 
       break; // roundfx
 
@@ -238,7 +238,7 @@  avr_resolve_overloaded_builtin (unsigned int iloc, tree fndecl, void *vargs)
       fold = targetm.builtin_decl (id, true);
 
       if (fold != error_mark_node)
-        fold = build_function_call_vec (loc, fold, &args, NULL);
+        fold = build_function_call_vec (loc, vNULL, fold, &args, NULL);
 
       break; // countlsfx
     }
diff --git gcc/config/spu/spu-c.c gcc/config/spu/spu-c.c
index 411496d..9d7aa5a 100644
--- gcc/config/spu/spu-c.c
+++ gcc/config/spu/spu-c.c
@@ -181,7 +181,7 @@  spu_resolve_overloaded_builtin (location_t loc, tree fndecl, void *passed_args)
       return error_mark_node;
     }
 
-  return build_function_call_vec (loc, match, fnargs, NULL);
+  return build_function_call_vec (loc, vNULL, match, fnargs, NULL);
 #undef SCALAR_TYPE_P
 }