mirror of
https://gitlab.alpinelinux.org/alpine/aports.git
synced 2025-07-26 04:35:39 +03:00
155 lines
4.4 KiB
Diff
155 lines
4.4 KiB
Diff
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] 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>
|
|
---
|
|
erasure_code/aarch64/gf_2vect_mad_neon.S | 5 +++--
|
|
erasure_code/aarch64/gf_3vect_mad_neon.S | 5 +++--
|
|
erasure_code/aarch64/gf_4vect_mad_neon.S | 5 +++--
|
|
erasure_code/aarch64/gf_5vect_mad_neon.S | 5 +++--
|
|
erasure_code/aarch64/gf_6vect_mad_neon.S | 5 +++--
|
|
erasure_code/aarch64/gf_vect_mad_neon.S | 5 +++--
|
|
6 files changed, 18 insertions(+), 12 deletions(-)
|
|
|
|
diff --git a/erasure_code/aarch64/gf_2vect_mad_neon.S b/erasure_code/aarch64/gf_2vect_mad_neon.S
|
|
index 92c19f54..b8a8cadc 100644
|
|
--- a/erasure_code/aarch64/gf_2vect_mad_neon.S
|
|
+++ b/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
|
|
diff --git a/erasure_code/aarch64/gf_3vect_mad_neon.S b/erasure_code/aarch64/gf_3vect_mad_neon.S
|
|
index 4a041e05..d9a3cccc 100644
|
|
--- a/erasure_code/aarch64/gf_3vect_mad_neon.S
|
|
+++ b/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
|
|
diff --git a/erasure_code/aarch64/gf_4vect_mad_neon.S b/erasure_code/aarch64/gf_4vect_mad_neon.S
|
|
index d56cece4..86924370 100644
|
|
--- a/erasure_code/aarch64/gf_4vect_mad_neon.S
|
|
+++ b/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
|
|
diff --git a/erasure_code/aarch64/gf_5vect_mad_neon.S b/erasure_code/aarch64/gf_5vect_mad_neon.S
|
|
index 5cbc6bf9..f0ff163f 100644
|
|
--- a/erasure_code/aarch64/gf_5vect_mad_neon.S
|
|
+++ b/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
|
|
diff --git a/erasure_code/aarch64/gf_6vect_mad_neon.S b/erasure_code/aarch64/gf_6vect_mad_neon.S
|
|
index 4886440b..7ec2d80b 100644
|
|
--- a/erasure_code/aarch64/gf_6vect_mad_neon.S
|
|
+++ b/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
|
|
diff --git a/erasure_code/aarch64/gf_vect_mad_neon.S b/erasure_code/aarch64/gf_vect_mad_neon.S
|
|
index 0e25a51e..9ebd86b4 100644
|
|
--- a/erasure_code/aarch64/gf_vect_mad_neon.S
|
|
+++ b/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
|