|
Kyle McMartin |
b66a13 |
diff --git a/sysdeps/aarch64/dl-tlsdesc.S b/sysdeps/aarch64/dl-tlsdesc.S
|
|
Kyle McMartin |
b66a13 |
index ded5471..7d28496 100644
|
|
Kyle McMartin |
b66a13 |
--- a/sysdeps/aarch64/dl-tlsdesc.S
|
|
Kyle McMartin |
b66a13 |
+++ b/sysdeps/aarch64/dl-tlsdesc.S
|
|
Kyle McMartin |
b66a13 |
@@ -140,7 +140,7 @@ _dl_tlsdesc_undefweak:
|
|
Kyle McMartin |
b66a13 |
cfi_startproc
|
|
Kyle McMartin |
b66a13 |
.align 2
|
|
Kyle McMartin |
b66a13 |
_dl_tlsdesc_dynamic:
|
|
Kyle McMartin |
b66a13 |
-# define NSAVEXREGPAIRS 2
|
|
Kyle McMartin |
b66a13 |
+# define NSAVEXREGPAIRS 3
|
|
Kyle McMartin |
b66a13 |
stp x29, x30, [sp,#-(32+16*NSAVEXREGPAIRS)]!
|
|
Kyle McMartin |
b66a13 |
cfi_adjust_cfa_offset (32+16*NSAVEXREGPAIRS)
|
|
Kyle McMartin |
b66a13 |
mov x29, sp
|
|
Kyle McMartin |
b66a13 |
@@ -151,6 +151,10 @@ _dl_tlsdesc_dynamic:
|
|
Kyle McMartin |
b66a13 |
stp x1, x2, [sp, #32+16*0]
|
|
Kyle McMartin |
b66a13 |
stp x3, x4, [sp, #32+16*1]
|
|
Kyle McMartin |
b66a13 |
|
|
Kyle McMartin |
b66a13 |
+ /* Work around GCC rescheduling compares across tlsdesc calls. */
|
|
Kyle McMartin |
b66a13 |
+ mrs x30, nzcv
|
|
Kyle McMartin |
b66a13 |
+ stp xzr, x30, [sp, #32+16*2]
|
|
Kyle McMartin |
b66a13 |
+
|
|
Kyle McMartin |
b66a13 |
mrs x4, tpidr_el0
|
|
Kyle McMartin |
b66a13 |
ldr x1, [x0,#8]
|
|
Kyle McMartin |
b66a13 |
ldr x0, [x4]
|
|
Kyle McMartin |
b66a13 |
@@ -169,6 +173,8 @@ _dl_tlsdesc_dynamic:
|
|
Kyle McMartin |
b66a13 |
1:
|
|
Kyle McMartin |
b66a13 |
ldp x1, x2, [sp, #32+16*0]
|
|
Kyle McMartin |
b66a13 |
ldp x3, x4, [sp, #32+16*1]
|
|
Kyle McMartin |
b66a13 |
+ ldp xzr, x30, [sp, #32+16*2]
|
|
Kyle McMartin |
b66a13 |
+ msr nzcv, x30
|
|
Kyle McMartin |
b66a13 |
|
|
Kyle McMartin |
b66a13 |
ldp x29, x30, [sp], #(32+16*NSAVEXREGPAIRS)
|
|
Kyle McMartin |
b66a13 |
cfi_adjust_cfa_offset (32+16*NSAVEXREGPAIRS)
|