about summary refs log tree commit diff
diff options
context:
space:
mode:
-rw-r--r--NEWS1
-rw-r--r--sysdeps/x86_64/dl-tlsdesc.S2
2 files changed, 2 insertions, 1 deletions
diff --git a/NEWS b/NEWS
index 70936f90a9..e4777c13da 100644
--- a/NEWS
+++ b/NEWS
@@ -84,6 +84,7 @@ The following bugs are resolved with this release:
   [30515] _dl_find_object incorrectly returns 1 during early startup
   [30804] F_GETLK, F_SETLK, and F_SETLKW value change for powerpc64 with
     -D_FILE_OFFSET_BITS=64
+  [31184] FAIL: elf/tst-tlsgap
 
 Security related changes:
 
diff --git a/sysdeps/x86_64/dl-tlsdesc.S b/sysdeps/x86_64/dl-tlsdesc.S
index 0db2cb4152..706856e095 100644
--- a/sysdeps/x86_64/dl-tlsdesc.S
+++ b/sysdeps/x86_64/dl-tlsdesc.S
@@ -102,7 +102,7 @@ _dl_tlsdesc_dynamic:
 	/* Preserve call-clobbered registers that we modify.
 	   We need two scratch regs anyway.  */
 	movq	%rsi, -16(%rsp)
-	movq	%fs:DTV_OFFSET, %rsi
+	mov	%fs:DTV_OFFSET, %RSI_LP
 	movq	%rdi, -8(%rsp)
 	movq	TLSDESC_ARG(%rax), %rdi
 	movq	(%rsi), %rax