From 65f14869fd3fbee8ed4c4ca49de8aaa86dbc66cb Mon Sep 17 00:00:00 2001
From: Andrew Burgess <andrew.burgess@embecosm.com>
Date: Fri, 5 Jan 2018 14:59:05 +0000
Subject: [PATCH] ld: Remove unused expression state

Previous commit removed all uses of the defsym field within the linker
expression union.  This commit cleans up the now redundant state.

ld/ChangeLog:

	* ldexp.h (union etree_union): Remove defsym field.
	* ldexp.c (exp_assop): Remove defsym parameter, and use of defsym
	parameter.
	(exp_assign): Remove passing of defsym parameter.
	(exp_defsym): Likewise.
	(exp_provide): Likewise.
---
 ld/ChangeLog | 9 +++++++++
 ld/ldexp.c   | 8 +++-----
 ld/ldexp.h   | 1 -
 3 files changed, 12 insertions(+), 6 deletions(-)

diff --git a/ld/ChangeLog b/ld/ChangeLog
index 956a8563389..83545d55aa0 100644
--- a/ld/ChangeLog
+++ b/ld/ChangeLog
@@ -1,3 +1,12 @@
+2018-01-11  Andrew Burgess  <andrew.burgess@embecosm.com>
+
+	* ldexp.h (union etree_union): Remove defsym field.
+	* ldexp.c (exp_assop): Remove defsym parameter, and use of defsym
+	parameter.
+	(exp_assign): Remove passing of defsym parameter.
+	(exp_defsym): Likewise.
+	(exp_provide): Likewise.
+
 2018-01-11  Andrew Burgess  <andrew.burgess@embecosm.com>
 
 	* ldexp.c (exp_fold_tree_1): Rework condition underwhich provide
diff --git a/ld/ldexp.c b/ld/ldexp.c
index 6398a2d3d45..a0972058fe1 100644
--- a/ld/ldexp.c
+++ b/ld/ldexp.c
@@ -1338,7 +1338,6 @@ static etree_type *
 exp_assop (const char *dst,
 	   etree_type *src,
 	   enum node_tree_enum class,
-	   bfd_boolean defsym,
 	   bfd_boolean hidden)
 {
   etree_type *n;
@@ -1350,7 +1349,6 @@ exp_assop (const char *dst,
   n->assign.type.node_class = class;
   n->assign.src = src;
   n->assign.dst = dst;
-  n->assign.defsym = defsym;
   n->assign.hidden = hidden;
   return n;
 }
@@ -1360,7 +1358,7 @@ exp_assop (const char *dst,
 etree_type *
 exp_assign (const char *dst, etree_type *src, bfd_boolean hidden)
 {
-  return exp_assop (dst, src, etree_assign, FALSE, hidden);
+  return exp_assop (dst, src, etree_assign, hidden);
 }
 
 /* Handle --defsym command-line option.  */
@@ -1368,7 +1366,7 @@ exp_assign (const char *dst, etree_type *src, bfd_boolean hidden)
 etree_type *
 exp_defsym (const char *dst, etree_type *src)
 {
-  return exp_assop (dst, src, etree_assign, TRUE, FALSE);
+  return exp_assop (dst, src, etree_assign, FALSE);
 }
 
 /* Handle PROVIDE.  */
@@ -1376,7 +1374,7 @@ exp_defsym (const char *dst, etree_type *src)
 etree_type *
 exp_provide (const char *dst, etree_type *src, bfd_boolean hidden)
 {
-  return exp_assop (dst, src, etree_provide, FALSE, hidden);
+  return exp_assop (dst, src, etree_provide, hidden);
 }
 
 /* Handle ASSERT.  */
diff --git a/ld/ldexp.h b/ld/ldexp.h
index 572b703c203..d58cacba1c5 100644
--- a/ld/ldexp.h
+++ b/ld/ldexp.h
@@ -66,7 +66,6 @@ typedef union etree_union {
     node_type type;
     const char *dst;
     union etree_union *src;
-    bfd_boolean defsym;
     bfd_boolean hidden;
   } assign;
   struct {
-- 
2.30.2