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
87
88
89
90
91
92
93
94
95
96
97
98
99
100
101
102
103
104
105
106
107
108
109
110
111
112
113
114
115
116
117
118
119
120
121
122
123
124
125
126
127
128
129
130
131
132
133
134
135
136
137
138
139
140
141
142
143
144
145
146
147
148
149
150
151
152
153
154
155
156
157
158
159
160
161
162
163
164
165
166
167
168
169
170
171
172
173
174
175
176
177
178
179
180
181
182
183
184
185
186
187
188
189
190
191
192
193
194
195
196
197
198
199
200
201
202
203
204
205
206
207
208
209
210
211
212
213
214
215
216
217
218
219
220
221
222
223
224
225
226
227
228
229
230
231
232
233
234
235
236
237
238
239
240
241
242
243
|
From 9f0cfcdd4c342cc2a97bb4591c5542507f073435 Mon Sep 17 00:00:00 2001
From: Michael Eager <eager@eagercon.com>
Date: Wed, 31 Oct 2012 15:27:35 +0000
Subject: 2012-10-31 David Holsgrove <david.holsgrove@xilinx.com>
* config/tc-microblaze.c: Check for weak symbols before
emitting relocation.
2012-10-31 David Holsgrove <david.holsgrove@xilinx.com>
* gas/microblaze: New.
* gas/microblaze/reloc_sym.exp: Add test case.
* gas/microblaze/reloc_strongsym.s: Likewise.
* gas/microblaze/reloc_weaksym.s: Likewise.
* gas/microblaze/reloc_sym.d: Likewise.
Upstream-Status: Backport
diff --git a/gas/config/tc-microblaze.c b/gas/config/tc-microblaze.c
index 3ab854f..86ac90b 100644
--- a/gas/config/tc-microblaze.c
+++ b/gas/config/tc-microblaze.c
@@ -2065,7 +2065,8 @@ md_estimate_size_before_relax (fragS * fragP,
as_bad (_("Absolute PC-relative value in relaxation code. Assembler error....."));
abort ();
}
- else if ((S_GET_SEGMENT (fragP->fr_symbol) == segment_type))
+ else if (S_GET_SEGMENT (fragP->fr_symbol) == segment_type &&
+ !S_IS_WEAK (fragP->fr_symbol))
{
fragP->fr_subtype = DEFINED_PC_OFFSET;
/* Don't know now whether we need an imm instruction. */
diff --git a/gas/testsuite/gas/microblaze/reloc_strongsym.s b/gas/testsuite/gas/microblaze/reloc_strongsym.s
new file mode 100644
index 0000000..8f34028
--- /dev/null
+++ b/gas/testsuite/gas/microblaze/reloc_strongsym.s
@@ -0,0 +1,20 @@
+ .section ".testsection"
+ .align 2
+ .globl test_start
+ .ent test_start
+ .type test_start, @function
+test_start:
+ .frame r19,8,r15 # vars= 0, regs= 1, args= 0
+ .mask 0x00080000
+ addik r1,r1,-8
+ swi r19,r1,4
+ addk r19,r1,r0
+ addk r1,r19,r0
+ lwi r19,r1,4
+ addik r1,r1,8
+ rtsd r15,8
+ nop # Unfilled delay slot
+
+ .end test_start
+$Lfe1:
+ .size test_start,$Lfe1-test_start
diff --git a/gas/testsuite/gas/microblaze/reloc_sym.d b/gas/testsuite/gas/microblaze/reloc_sym.d
new file mode 100644
index 0000000..212d0bb
--- /dev/null
+++ b/gas/testsuite/gas/microblaze/reloc_sym.d
@@ -0,0 +1,45 @@
+
+reloc_sym.x: file format elf32-microblaze
+
+
+Disassembly of section .text:
+
+10000054 <__def_start>:
+10000054: 3021fff8 addik r1, r1, -8
+10000058: fa610004 swi r19, r1, 4
+1000005c: 12610000 addk r19, r1, r0
+10000060: 10330000 addk r1, r19, r0
+10000064: ea610004 lwi r19, r1, 4
+10000068: 30210008 addik r1, r1, 8
+1000006c: b60f0008 rtsd r15, 8
+10000070: 80000000 or r0, r0, r0
+
+10000074 <main>:
+10000074: 3021ffe0 addik r1, r1, -32
+10000078: f9e10000 swi r15, r1, 0
+1000007c: fa61001c swi r19, r1, 28
+10000080: 12610000 addk r19, r1, r0
+10000084: b000efff imm -4097
+10000088: b9f4ff7c brlid r15, -132 // 4 <test_start>
+1000008c: 80000000 or r0, r0, r0
+10000090: b9f4ffc4 brlid r15, -60 // 10000054 <__def_start>
+10000094: 80000000 or r0, r0, r0
+10000098: 10600000 addk r3, r0, r0
+1000009c: e9e10000 lwi r15, r1, 0
+100000a0: 10330000 addk r1, r19, r0
+100000a4: ea61001c lwi r19, r1, 28
+100000a8: 30210020 addik r1, r1, 32
+100000ac: b60f0008 rtsd r15, 8
+100000b0: 80000000 or r0, r0, r0
+
+Disassembly of section .testsection:
+
+00000004 <test_start>:
+ 4: 3021fff8 addik r1, r1, -8
+ 8: fa610004 swi r19, r1, 4
+ c: 12610000 addk r19, r1, r0
+ 10: 10330000 addk r1, r19, r0
+ 14: ea610004 lwi r19, r1, 4
+ 18: 30210008 addik r1, r1, 8
+ 1c: b60f0008 rtsd r15, 8
+ 20: 80000000 or r0, r0, r0
diff --git a/gas/testsuite/gas/microblaze/reloc_sym.exp b/gas/testsuite/gas/microblaze/reloc_sym.exp
new file mode 100644
index 0000000..c7f7322
--- /dev/null
+++ b/gas/testsuite/gas/microblaze/reloc_sym.exp
@@ -0,0 +1,27 @@
+# Relocation test.
+
+proc ld_test { objects ldflags dest test } {
+ set ld_output [target_link $objects $dest $ldflags]
+ if [string match "" $ld_output] then { pass $test } else { fail $test }
+}
+
+proc objdump_test { exec flags dest test } {
+ set objcopy [find_binutils_prog objdump]
+ verbose -log "$objcopy $flags $exec > $dest"
+ catch "exec $objcopy $flags $exec > $dest" objdump_output
+ if [string match "" $objdump_output] then { pass $test } else { fail $test }
+}
+
+proc regexp_test { file1 file2 test } {
+ if [regexp_diff $file1 $file2] then { fail $test } else { pass $test }
+}
+
+
+global srcdir subdir
+if [istarget microblaze*-*-*] {
+ gas_test "reloc_strongsym.s" {-o reloc_strongsym.o} {} {assembling reloc_strongsym}
+ gas_test "reloc_weaksym.s" {-o reloc_weaksym.o} {} {assembling reloc_weaksym}
+ ld_test {reloc_strongsym.o reloc_weaksym.o} {-e 0 -section-start .text=0x10000054 -section-start .testsection=0x4} {reloc_sym.x} {linking reloc_sym.x}
+ objdump_test {reloc_sym.x} {-d --section=.text --section=.testsection} {reloc_sym.dump} {disassembling reloc_sym.x}
+ regexp_test {reloc_sym.dump} "$srcdir/$subdir/reloc_sym.d" {matching disassembly}
+}
diff --git a/gas/testsuite/gas/microblaze/reloc_weaksym.s b/gas/testsuite/gas/microblaze/reloc_weaksym.s
new file mode 100644
index 0000000..7dd9b98
--- /dev/null
+++ b/gas/testsuite/gas/microblaze/reloc_weaksym.s
@@ -0,0 +1,52 @@
+ .text
+ .align 2
+ .globl __def_start
+ .ent __def_start
+ .type __def_start, @function
+__def_start:
+ .frame r19,8,r15 # vars= 0, regs= 1, args= 0
+ .mask 0x00080000
+ addik r1,r1,-8
+ swi r19,r1,4
+ addk r19,r1,r0
+ addk r1,r19,r0
+ lwi r19,r1,4
+ addik r1,r1,8
+ rtsd r15,8
+ nop # Unfilled delay slot
+
+ .end __def_start
+$Lfe1:
+ .size __def_start,$Lfe1-__def_start
+ .align 2
+ .globl main
+ .ent main
+ .type main, @function
+main:
+ .frame r19,32,r15 # vars= 0, regs= 1, args= 24
+ .mask 0x00088000
+ addik r1,r1,-32
+ swi r15,r1,0
+ swi r19,r1,28
+ addk r19,r1,r0
+ brlid r15,test_start
+ nop # Unfilled delay slot
+
+ brlid r15,test_start_strong
+ nop # Unfilled delay slot
+
+ addk r3,r0,r0
+ lwi r15,r1,0
+ addk r1,r19,r0
+ lwi r19,r1,28
+ addik r1,r1,32
+ rtsd r15,8
+ nop # Unfilled delay slot
+
+ .end main
+$Lfe2:
+ .size main,$Lfe2-main
+ .weakext test_start
+ test_start = __def_start
+ .globl test_start_strong
+ test_start_strong = __def_start
diff --git a/gas/testsuite/gas/microblaze/special_reg.d b/gas/testsuite/gas/microblaze/special_reg.d
new file mode 100644
index 0000000..aad0131
--- /dev/null
+++ b/gas/testsuite/gas/microblaze/special_reg.d
@@ -0,0 +1,14 @@
+#as:
+#objdump: -ds
+
+.*: file format .*
+
+Contents of section .text:
+ 0000 9409d000 6c00d000 001ff800 ....l.......
+
+Disassembly of section .text:
+
+00000000 <.text>:
+ 0: 9409d000 mts rpid, r9
+ 4: 6c00d000 tnput rfsl0
+ 8: 001ff800 add r0, r31, r31
diff --git a/gas/testsuite/gas/microblaze/special_reg.exp b/gas/testsuite/gas/microblaze/special_reg.exp
new file mode 100644
index 0000000..4824f76
--- /dev/null
+++ b/gas/testsuite/gas/microblaze/special_reg.exp
@@ -0,0 +1,5 @@
+# MicroBlaze test for special register.
+
+if [istarget microblaze*-*-*] {
+ run_dump_test "special_reg"
+}
diff --git a/gas/testsuite/gas/microblaze/special_reg.s b/gas/testsuite/gas/microblaze/special_reg.s
new file mode 100644
index 0000000..d92ee4d
--- /dev/null
+++ b/gas/testsuite/gas/microblaze/special_reg.s
@@ -0,0 +1,3 @@
+ mts rpid, r9
+ tnput rfsl0
+ add r0, r31, r31
--
1.7.5.4
|
