1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
85
86
|
From 6238123cdc680941f3b3a253cca5be06d5c81492 Mon Sep 17 00:00:00 2001
From: Mahesh Bodapati <mbodapat@xilinx.com>
Date: Wed, 27 Feb 2019 15:12:32 +0530
Subject: [PATCH 21/34] Revert "ld: Remove unused expression state" --defsym
symbol=expression Create a global symbol in the output file, containing the
absolute address given by expression.
This reverts commit 65f14869fd3fbee8ed4c4ca49de8aaa86dbc66cb.
Conflicts:
ld/ChangeLog
Conflicts:
ld/ldexp.c
ld/ldexp.h
Upstream-Status: Pending
Signed-off-by: Mark Hatle <mark.hatle@amd.com>
---
ld/ldexp.c | 8 +++++---
ld/ldexp.h | 1 +
2 files changed, 6 insertions(+), 3 deletions(-)
diff --git a/ld/ldexp.c b/ld/ldexp.c
index d4d8706968d..b7f4361129f 100644
--- a/ld/ldexp.c
+++ b/ld/ldexp.c
@@ -1380,6 +1380,7 @@ static etree_type *
exp_assop (const char *dst,
etree_type *src,
enum node_tree_enum class,
+ bool defsym,
bool hidden)
{
etree_type *n;
@@ -1391,6 +1392,7 @@ 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;
}
@@ -1400,7 +1402,7 @@ exp_assop (const char *dst,
etree_type *
exp_assign (const char *dst, etree_type *src, bool hidden)
{
- return exp_assop (dst, src, etree_assign, hidden);
+ return exp_assop (dst, src, etree_assign, false, hidden);
}
/* Handle --defsym command-line option. */
@@ -1408,7 +1410,7 @@ exp_assign (const char *dst, etree_type *src, bool hidden)
etree_type *
exp_defsym (const char *dst, etree_type *src)
{
- return exp_assop (dst, src, etree_assign, false);
+ return exp_assop (dst, src, etree_assign, true, false);
}
/* Handle PROVIDE. */
@@ -1416,7 +1418,7 @@ exp_defsym (const char *dst, etree_type *src)
etree_type *
exp_provide (const char *dst, etree_type *src, bool hidden)
{
- return exp_assop (dst, src, etree_provide, hidden);
+ return exp_assop (dst, src, etree_provide, false, hidden);
}
/* Handle ASSERT. */
diff --git a/ld/ldexp.h b/ld/ldexp.h
index ed6fb8be715..e838b736306 100644
--- a/ld/ldexp.h
+++ b/ld/ldexp.h
@@ -66,6 +66,7 @@ typedef union etree_union {
node_type type;
const char *dst;
union etree_union *src;
+ bool defsym;
bool hidden;
} assign;
struct {
--
2.37.1 (Apple Git-137.1)
|
