From patchwork Thu Sep 20 17:06:53 2012
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: 7bit
Subject: [PR,target/54631] Update vxworks.c to new VEC_quick_push interface
From: Diego Novillo <dnovillo@google.com>
X-Patchwork-Id: 185435
Message-Id: <20120920170653.GA8255@google.com>
To: gcc-patches@gcc.gnu.org
Cc: Robert Mason <rbmj@verizon.net>
Date: Thu, 20 Sep 2012 13:06:53 -0400

Tested by building stage 1 on i686-wrs-vxworks.  Robert, please
verify that the fix actually works for you.

Thanks.  Diego.

2012-09-20  Diego Novillo  <dnovillo@google.com>

	PR target/54631
	* config/vxworks.c (vxworks_emutls_var_init): Update for new
	VEC_quick_push interface.


diff --git a/gcc/config/vxworks.c b/gcc/config/vxworks.c
index d88f03f..9eeefc0 100644
--- a/gcc/config/vxworks.c
+++ b/gcc/config/vxworks.c
@@ -97,24 +97,22 @@ static tree
 vxworks_emutls_var_init (tree var, tree decl, tree tmpl_addr)
 {
   VEC(constructor_elt,gc) *v = VEC_alloc (constructor_elt, gc, 3);
-  constructor_elt *elt;
   
   tree type = TREE_TYPE (var);
   tree field = TYPE_FIELDS (type);
   
-  elt = VEC_quick_push (constructor_elt, v, NULL);
-  elt->index = field;
-  elt->value = fold_convert (TREE_TYPE (field), tmpl_addr);
+  constructor_elt elt = {field, fold_convert (TREE_TYPE (field), tmpl_addr)};
+  VEC_quick_push (constructor_elt, v, elt);
   
-  elt = VEC_quick_push (constructor_elt, v, NULL);
   field = DECL_CHAIN (field);
-  elt->index = field;
-  elt->value = build_int_cst (TREE_TYPE (field), 0);
+  elt.index = field;
+  elt.value = build_int_cst (TREE_TYPE (field), 0);
+  VEC_quick_push (constructor_elt, v, elt);
   
-  elt = VEC_quick_push (constructor_elt, v, NULL);
   field = DECL_CHAIN (field);
-  elt->index = field;
-  elt->value = fold_convert (TREE_TYPE (field), DECL_SIZE_UNIT (decl));
+  elt.index = field;
+  elt.value = fold_convert (TREE_TYPE (field), DECL_SIZE_UNIT (decl));
+  VEC_quick_push (constructor_elt, v, elt);
   
   return build_constructor (type, v);
 }