* config/spu/spu.c (spu_init_builtins): No longer add END_BUILTINS

	to the function code for SPU MD builtins.
	(spu_expand_builtin): Update.
	* config/spu/spu-c.c (spu_resolve_overloaded_builtin): Update.

git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@164873 138bc75d-0d04-0410-961f-82ee72b054a4

diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index 062a6f1..d2f6bf3 100644 (file)
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,5 +1,12 @@
 2010-10-01  Ulrich Weigand  <Ulrich.Weigand@de.ibm.com>
 
+       * config/spu/spu.c (spu_init_builtins): No longer add END_BUILTINS
+       to the function code for SPU MD builtins.
+       (spu_expand_builtin): Update.
+       * config/spu/spu-c.c (spu_resolve_overloaded_builtin): Update.
+
+2010-10-01  Ulrich Weigand  <Ulrich.Weigand@de.ibm.com>
+
        * config/spu/spu.c (TARGET_EXCEPT_UNWIND_INFO): Set to
        sjlj_except_unwind_info.
 

diff --git a/gcc/config/spu/spu-c.c b/gcc/config/spu/spu-c.c
index 1f22cd6..b8ac433 100644 (file)
--- a/gcc/config/spu/spu-c.c
+++ b/gcc/config/spu/spu-c.c
@@ -95,7 +95,7 @@ spu_resolve_overloaded_builtin (location_t loc, tree fndecl, void *passed_args)
                          || POINTER_TYPE_P (t))
   VEC(tree,gc) *fnargs = (VEC(tree,gc) *) passed_args;
   unsigned int nargs = VEC_length (tree, fnargs);
-  int new_fcode, fcode = DECL_FUNCTION_CODE (fndecl) - END_BUILTINS;
+  int new_fcode, fcode = DECL_FUNCTION_CODE (fndecl);
   struct spu_builtin_description *desc;
   tree match = NULL_TREE;
 

diff --git a/gcc/config/spu/spu.c b/gcc/config/spu/spu.c
index 5be6a91..d2f10ac 100644 (file)
--- a/gcc/config/spu/spu.c
+++ b/gcc/config/spu/spu.c
@@ -5716,8 +5716,7 @@ spu_init_builtins (void)
 
       sprintf (name, "__builtin_%s", d->name);
       spu_builtin_decls[i] =
-       add_builtin_function (name, p, END_BUILTINS + i, BUILT_IN_MD,
-                             NULL, NULL_TREE);
+       add_builtin_function (name, p, i, BUILT_IN_MD, NULL, NULL_TREE);
       if (d->fcode == SPU_MASK_FOR_LOAD)
        TREE_READONLY (spu_builtin_decls[i]) = 1;       
 
@@ -6645,7 +6644,7 @@ spu_expand_builtin (tree exp,
                    int ignore ATTRIBUTE_UNUSED)
 {
   tree fndecl = TREE_OPERAND (CALL_EXPR_FN (exp), 0);
-  unsigned int fcode = DECL_FUNCTION_CODE (fndecl) - END_BUILTINS;
+  unsigned int fcode = DECL_FUNCTION_CODE (fndecl);
   struct spu_builtin_description *d;
 
   if (fcode < NUM_SPU_BUILTINS)