[Glibc-bsd-commits] r2317 - in trunk/kfreebsd-7/debian: . patches

[ps-guest at alioth.debian.org]

Author: ps-guest
Date: 2008-09-18 06:33:54 +0000 (Thu, 18 Sep 2008)
New Revision: 2317

Modified:
   trunk/kfreebsd-7/debian/changelog
   trunk/kfreebsd-7/debian/patches/005_binutils.diff
Log:
* update 005_binutils.diff



Modified: trunk/kfreebsd-7/debian/changelog
===================================================================
--- trunk/kfreebsd-7/debian/changelog	2008-09-12 08:26:02 UTC (rev 2316)
+++ trunk/kfreebsd-7/debian/changelog	2008-09-18 06:33:54 UTC (rev 2317)
@@ -1,4 +1,4 @@
-kfreebsd-7 (7.1~cvs20080912-1) EXPERIMENTAL; urgency=low
+kfreebsd-7 (7.1~cvs20080918-1) EXPERIMENTAL; urgency=low
 
   [ Petr Salinger ]
   * New upstream snapshot of RELENG_7

Modified: trunk/kfreebsd-7/debian/patches/005_binutils.diff
===================================================================
--- trunk/kfreebsd-7/debian/patches/005_binutils.diff	2008-09-12 08:26:02 UTC (rev 2316)
+++ trunk/kfreebsd-7/debian/patches/005_binutils.diff	2008-09-18 06:33:54 UTC (rev 2317)
@@ -114,12 +114,12 @@
  	movl	%esp, %ebx			/* pass sigframe */
  	push	%eax				/* fake ret addr */
  	movl	$LINUX_SYS_linux_sigreturn,%eax	/* linux_sigreturn() */
-@@ -19,7 +19,7 @@
- linux_rt_sigcode:
+@@ -20,7 +20,7 @@
  	call	*LINUX_RT_SIGF_HANDLER(%esp)
  	leal	LINUX_RT_SIGF_UC(%esp),%ebx	/* linux ucp */
--	movl	LINUX_SC_GS(%ebx),%gs
-+	movw	LINUX_SC_GS(%ebx),%gs
+ 	leal	LINUX_RT_SIGF_SC(%ebx),%ecx	/* linux sigcontext */
+-	movl	LINUX_SC_GS(%ecx),%gs
++	movw	LINUX_SC_GS(%ecx),%gs
  	push	%eax				/* fake ret addr */
  	movl	$LINUX_SYS_linux_rt_sigreturn,%eax   /* linux_rt_sigreturn() */
  	int	$0x80				/* enter kernel with args */
@@ -140,7 +140,7 @@
 ===================================================================
 --- src.orig/sys/amd64/amd64/cpu_switch.S
 +++ src/sys/amd64/amd64/cpu_switch.S
-@@ -243,12 +243,12 @@
+@@ -259,12 +259,12 @@
  	jmp	do_tss
  
  store_seg:
@@ -155,9 +155,9 @@
 +	movw	%es,PCB_ES(%r8)
 +	movw	%fs,PCB_FS(%r8)
  	jmp	done_store_seg
- 2:	movq	PCB_GS32P(%r8),%rax
+ 2:	movq	PCPU(GS32P),%rax
  	movq	(%rax),%rax
-@@ -260,11 +260,11 @@
+@@ -276,11 +276,11 @@
  	jnz	2f
  1:	movl	$MSR_GSBASE,%ecx
  	rdmsr
@@ -172,7 +172,7 @@
 +	movw	PCB_FS(%r8),%fs
  	jmp	done_load_seg
  	/* Restore userland %gs while preserving kernel gsbase */
- 2:	movq	PCB_GS32P(%r8),%rax
+ 2:	movq	PCPU(GS32P),%rax
 Index: src/sys/amd64/ia32/ia32_signal.c
 ===================================================================
 --- src.orig/sys/amd64/ia32/ia32_signal.c
@@ -347,14 +347,14 @@
  	movl	%esp, %ebx			/* pass sigframe */
  	push	%eax				/* fake ret addr */
  	movl	$LINUX_SYS_linux_sigreturn,%eax	/* linux_sigreturn() */
-@@ -23,8 +23,8 @@
- linux_rt_sigcode:
+@@ -24,8 +24,8 @@
  	call	*LINUX_RT_SIGF_HANDLER(%esp)
  	leal	LINUX_RT_SIGF_UC(%esp),%ebx	/* linux ucp */
--	movl	LINUX_SC_ES(%ebx),%es
--	movl	LINUX_SC_DS(%ebx),%ds
-+	mov	LINUX_SC_ES(%ebx),%es
-+	mov	LINUX_SC_DS(%ebx),%ds
+ 	leal	LINUX_RT_SIGF_SC(%ebx),%ecx	/* linux sigcontext */
+-	movl	LINUX_SC_ES(%ecx),%es
+-	movl	LINUX_SC_DS(%ecx),%ds
++	mov	LINUX_SC_ES(%ecx),%es
++	mov	LINUX_SC_DS(%ecx),%ds
  	push	%eax				/* fake ret addr */
  	movl	$LINUX_SYS_linux_rt_sigreturn,%eax   /* linux_rt_sigreturn() */
  	int	$0x80				/* enter kernel with args */