about summary refs log tree commit diff
path: root/sysdeps
diff options
context:
space:
mode:
Diffstat (limited to 'sysdeps')
-rw-r--r--sysdeps/unix/sysv/linux/i386/getcontext.S10
-rw-r--r--sysdeps/unix/sysv/linux/i386/setcontext.S5
-rw-r--r--sysdeps/unix/sysv/linux/i386/swapcontext.S17
3 files changed, 12 insertions, 20 deletions
diff --git a/sysdeps/unix/sysv/linux/i386/getcontext.S b/sysdeps/unix/sysv/linux/i386/getcontext.S
index ddc0f6f117..600a886863 100644
--- a/sysdeps/unix/sysv/linux/i386/getcontext.S
+++ b/sysdeps/unix/sysv/linux/i386/getcontext.S
@@ -43,13 +43,11 @@ ENTRY(__getcontext)
 	movl	%ecx, oESP(%eax)
 	movl	%ebx, oEBX(%eax)
 
-	/* Save the FS and GS segment register.  */
+	/* Save the FS segment register.  We don't touch the GS register
+	   since it is used for threads.  */
 	xorl	%edx, %edx
-	xorl	%ecx, %ecx
-	movw	%gs, %dx
-	movw	%fs, %cx
-	movl	%edx, oGS(%eax)
-	movl	%ecx, oFS(%eax)
+	movw	%fs, %dx
+	movl	%edx, oFS(%eax)
 
 	/* We have separate floating-point register content memory on the
 	   stack.  We use the __fpregs_mem block in the context.  Set the
diff --git a/sysdeps/unix/sysv/linux/i386/setcontext.S b/sysdeps/unix/sysv/linux/i386/setcontext.S
index 985212310e..58a122fc28 100644
--- a/sysdeps/unix/sysv/linux/i386/setcontext.S
+++ b/sysdeps/unix/sysv/linux/i386/setcontext.S
@@ -48,10 +48,9 @@ ENTRY(__setcontext)
 	movl	oFPREGS(%eax), %ecx
 	fldenv	(%ecx)
 
-	/* Restore the FS and GS segment registers.  */
-	movl	oGS(%eax), %edx
+	/* Restore the FS segment register.  We don't touch the GS register
+	   since it is used for threads.  */
 	movl	oFS(%eax), %ecx
-	movw	%dx, %gs
 	movw	%cx, %fs
 
 	/* Load the new stack pointer.  */
diff --git a/sysdeps/unix/sysv/linux/i386/swapcontext.S b/sysdeps/unix/sysv/linux/i386/swapcontext.S
index a8481b2924..0c249437a5 100644
--- a/sysdeps/unix/sysv/linux/i386/swapcontext.S
+++ b/sysdeps/unix/sysv/linux/i386/swapcontext.S
@@ -43,13 +43,10 @@ ENTRY(__swapcontext)
 	movl	%ecx, oESP(%eax)
 	movl	%ebx, oEBX(%eax)
 
-	/* Save the FS and GS segment register.  */
+	/* Save the FS segment register.  */
 	xorl	%edx, %edx
-	xorl	%ecx, %ecx
-	movw	%gs, %dx
-	movw	%fs, %cx
-	movl	%edx, oGS(%eax)
-	movl	%ecx, oFS(%eax)
+	movw	%fs, %dx
+	movl	%edx, oFS(%eax)
 
 	/* We have separate floating-point register content memory on the
 	   stack.  We use the __fpregs_mem block in the context.  Set the
@@ -81,11 +78,9 @@ ENTRY(__swapcontext)
 	movl	oFPREGS(%eax), %ecx
 	fldenv	(%ecx)
 
-	/* Restore the FS and GS segment registers.  */
-	movl	oGS(%eax), %edx
-	movl	oFS(%eax), %ecx
-	movw	%dx, %gs
-	movw	%cx, %fs
+	/* Restore the FS segment registers.  */
+	movl	oFS(%eax), %edx
+	movw	%dx, %fs
 
 	/* Load the new stack pointer.  */
 	movl	oESP(%eax), %ecx