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
|
From db463aa139aa0f3eb996062bd7c65f0d10a7932b Mon Sep 17 00:00:00 2001
From: luo rixin <luorixin@huawei.com>
Date: Fri, 8 Jan 2021 16:16:02 +0800
Subject: [PATCH] src/isa-l/erasure_code: Fix text relocation on aarch64
Here is the bug report on ceph. https://tracker.ceph.com/issues/48681
Signed-off-by: luo rixin <luorixin@huawei.com>
---
src/isa-l/erasure_code/aarch64/gf_2vect_mad_neon.S | 5 +++--
src/isa-l/erasure_code/aarch64/gf_3vect_mad_neon.S | 5 +++--
src/isa-l/erasure_code/aarch64/gf_4vect_mad_neon.S | 5 +++--
src/isa-l/erasure_code/aarch64/gf_5vect_mad_neon.S | 5 +++--
src/isa-l/erasure_code/aarch64/gf_6vect_mad_neon.S | 5 +++--
src/isa-l/erasure_code/aarch64/gf_vect_mad_neon.S | 5 +++--
6 files changed, 18 insertions(+), 12 deletions(-)
--- a/src/isa-l/erasure_code/aarch64/gf_2vect_mad_neon.S
+++ b/src/isa-l/erasure_code/aarch64/gf_2vect_mad_neon.S
@@ -360,7 +360,8 @@ gf_2vect_mad_neon:
sub x_dest1, x_dest1, x_tmp
sub x_dest2, x_dest2, x_tmp
- ldr x_const, =const_tbl
+ adrp x_const, const_tbl
+ add x_const, x_const, :lo12:const_tbl
sub x_const, x_const, x_tmp
ldr q_tmp, [x_const, #16]
@@ -394,7 +395,7 @@ gf_2vect_mad_neon:
mov w_ret, #1
ret
-.section .data
+.section .rodata
.balign 8
const_tbl:
.dword 0x0000000000000000, 0x0000000000000000
--- a/src/isa-l/erasure_code/aarch64/gf_3vect_mad_neon.S
+++ b/src/isa-l/erasure_code/aarch64/gf_3vect_mad_neon.S
@@ -332,7 +332,8 @@ gf_3vect_mad_neon:
sub x_dest2, x_dest2, x_tmp
sub x_dest3, x_dest3, x_tmp
- ldr x_const, =const_tbl
+ adrp x_const, const_tbl
+ add x_const, x_const, :lo12:const_tbl
sub x_const, x_const, x_tmp
ldr q_tmp, [x_const, #16]
@@ -374,7 +375,7 @@ gf_3vect_mad_neon:
mov w_ret, #1
ret
-.section .data
+.section .rodata
.balign 8
const_tbl:
.dword 0x0000000000000000, 0x0000000000000000
--- a/src/isa-l/erasure_code/aarch64/gf_4vect_mad_neon.S
+++ b/src/isa-l/erasure_code/aarch64/gf_4vect_mad_neon.S
@@ -397,7 +397,8 @@ gf_4vect_mad_neon:
sub x_dest3, x_dest3, x_tmp
sub x_dest4, x_dest4, x_tmp
- ldr x_const, =const_tbl
+ adrp x_const, const_tbl
+ add x_const, x_const, :lo12:const_tbl
sub x_const, x_const, x_tmp
ldr q_tmp, [x_const, #16]
@@ -448,7 +449,7 @@ gf_4vect_mad_neon:
mov w_ret, #1
ret
-.section .data
+.section .rodata
.balign 8
const_tbl:
.dword 0x0000000000000000, 0x0000000000000000
--- a/src/isa-l/erasure_code/aarch64/gf_5vect_mad_neon.S
+++ b/src/isa-l/erasure_code/aarch64/gf_5vect_mad_neon.S
@@ -463,7 +463,8 @@ gf_5vect_mad_neon:
sub x_dest4, x_dest4, x_tmp
sub x_dest5, x_dest5, x_tmp
- ldr x_const, =const_tbl
+ adrp x_const, const_tbl
+ add x_const, x_const, :lo12:const_tbl
sub x_const, x_const, x_tmp
ldr q_tmp, [x_const, #16]
@@ -527,7 +528,7 @@ gf_5vect_mad_neon:
mov w_ret, #1
ret
-.section .data
+.section .rodata
.balign 8
const_tbl:
.dword 0x0000000000000000, 0x0000000000000000
--- a/src/isa-l/erasure_code/aarch64/gf_6vect_mad_neon.S
+++ b/src/isa-l/erasure_code/aarch64/gf_6vect_mad_neon.S
@@ -526,7 +526,8 @@ gf_6vect_mad_neon:
sub x_dest5, x_dest5, x_tmp
sub x_dest6, x_dest6, x_tmp
- ldr x_const, =const_tbl
+ adrp x_const, const_tbl
+ add x_const, x_const, :lo12:const_tbl
sub x_const, x_const, x_tmp
ldr q_tmp, [x_const, #16]
@@ -602,7 +603,7 @@ gf_6vect_mad_neon:
mov w_ret, #1
ret
-.section .data
+.section .rodata
.balign 8
const_tbl:
.dword 0x0000000000000000, 0x0000000000000000
--- a/src/isa-l/erasure_code/aarch64/gf_vect_mad_neon.S
+++ b/src/isa-l/erasure_code/aarch64/gf_vect_mad_neon.S
@@ -281,7 +281,8 @@ gf_vect_mad_neon:
mov x_src, x_src_end
sub x_dest1, x_dest1, x_tmp
- ldr x_const, =const_tbl
+ adrp x_const, const_tbl
+ add x_const, x_const, :lo12:const_tbl
sub x_const, x_const, x_tmp
ldr q_tmp, [x_const, #16]
@@ -307,7 +308,7 @@ gf_vect_mad_neon:
mov w_ret, #1
ret
-.section .data
+.section .rodata
.balign 8
const_tbl:
.dword 0x0000000000000000, 0x0000000000000000
|
