Aren
/
NetBSD
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix PR #1445 (incorrect ifdef/else/endif), from Bill Sommerfeld via 

John Kohl.
This commit is contained in:
fvdl 1995-09-08 07:57:15 +00:00
parent 94f6fc8e46
commit 43279db68d
3 changed files with 6 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
sys/arch/i386/i386/linux_machdep.c
View File

@ -1,4 +1,4 @@
/* $NetBSD: linux_machdep.c,v 1.17 1995/09/07 21:55:43 fvdl Exp $ */ /* $NetBSD: linux_machdep.c,v 1.18 1995/09/08 07:57:15 fvdl Exp $ */
/* /*
* Copyright (c) 1995 Frank van der Linden * Copyright (c) 1995 Frank van der Linden
@ -134,14 +134,13 @@ linux_sendsig(catcher, sig, mask, code)
frame.sf_sc.sc_es = tf->tf_vm86_es; frame.sf_sc.sc_es = tf->tf_vm86_es;
frame.sf_sc.sc_ds = tf->tf_vm86_ds; frame.sf_sc.sc_ds = tf->tf_vm86_ds;
} else } else
#else #endif
{ {
__asm("movl %%gs,%w0" : "=r" (frame.sf_sc.sc_gs)); __asm("movl %%gs,%w0" : "=r" (frame.sf_sc.sc_gs));
__asm("movl %%fs,%w0" : "=r" (frame.sf_sc.sc_fs)); __asm("movl %%fs,%w0" : "=r" (frame.sf_sc.sc_fs));
frame.sf_sc.sc_es = tf->tf_es; frame.sf_sc.sc_es = tf->tf_es;
frame.sf_sc.sc_ds = tf->tf_ds; frame.sf_sc.sc_ds = tf->tf_ds;
} }
#endif
frame.sf_sc.sc_edi = tf->tf_edi; frame.sf_sc.sc_edi = tf->tf_edi;
frame.sf_sc.sc_esi = tf->tf_esi; frame.sf_sc.sc_esi = tf->tf_esi;
frame.sf_sc.sc_ebp = tf->tf_ebp; frame.sf_sc.sc_ebp = tf->tf_ebp;

5
sys/compat/linux/arch/i386/linux_machdep.c
View File

@ -1,4 +1,4 @@
/* $NetBSD: linux_machdep.c,v 1.17 1995/09/07 21:55:43 fvdl Exp $ */ /* $NetBSD: linux_machdep.c,v 1.18 1995/09/08 07:57:15 fvdl Exp $ */
/* /*
* Copyright (c) 1995 Frank van der Linden * Copyright (c) 1995 Frank van der Linden
@ -134,14 +134,13 @@ linux_sendsig(catcher, sig, mask, code)
frame.sf_sc.sc_es = tf->tf_vm86_es; frame.sf_sc.sc_es = tf->tf_vm86_es;
frame.sf_sc.sc_ds = tf->tf_vm86_ds; frame.sf_sc.sc_ds = tf->tf_vm86_ds;
} else } else
#else #endif
{ {
__asm("movl %%gs,%w0" : "=r" (frame.sf_sc.sc_gs)); __asm("movl %%gs,%w0" : "=r" (frame.sf_sc.sc_gs));
__asm("movl %%fs,%w0" : "=r" (frame.sf_sc.sc_fs)); __asm("movl %%fs,%w0" : "=r" (frame.sf_sc.sc_fs));
frame.sf_sc.sc_es = tf->tf_es; frame.sf_sc.sc_es = tf->tf_es;
frame.sf_sc.sc_ds = tf->tf_ds; frame.sf_sc.sc_ds = tf->tf_ds;
} }
#endif
frame.sf_sc.sc_edi = tf->tf_edi; frame.sf_sc.sc_edi = tf->tf_edi;
frame.sf_sc.sc_esi = tf->tf_esi; frame.sf_sc.sc_esi = tf->tf_esi;
frame.sf_sc.sc_ebp = tf->tf_ebp; frame.sf_sc.sc_ebp = tf->tf_ebp;

5
sys/compat/linux/i386/linux_machdep.c
View File

@ -1,4 +1,4 @@
/* $NetBSD: linux_machdep.c,v 1.17 1995/09/07 21:55:43 fvdl Exp $ */ /* $NetBSD: linux_machdep.c,v 1.18 1995/09/08 07:57:15 fvdl Exp $ */
/* /*
* Copyright (c) 1995 Frank van der Linden * Copyright (c) 1995 Frank van der Linden
@ -134,14 +134,13 @@ linux_sendsig(catcher, sig, mask, code)
frame.sf_sc.sc_es = tf->tf_vm86_es; frame.sf_sc.sc_es = tf->tf_vm86_es;
frame.sf_sc.sc_ds = tf->tf_vm86_ds; frame.sf_sc.sc_ds = tf->tf_vm86_ds;
} else } else
#else #endif
{ {
__asm("movl %%gs,%w0" : "=r" (frame.sf_sc.sc_gs)); __asm("movl %%gs,%w0" : "=r" (frame.sf_sc.sc_gs));
__asm("movl %%fs,%w0" : "=r" (frame.sf_sc.sc_fs)); __asm("movl %%fs,%w0" : "=r" (frame.sf_sc.sc_fs));
frame.sf_sc.sc_es = tf->tf_es; frame.sf_sc.sc_es = tf->tf_es;
frame.sf_sc.sc_ds = tf->tf_ds; frame.sf_sc.sc_ds = tf->tf_ds;
} }
#endif
frame.sf_sc.sc_edi = tf->tf_edi; frame.sf_sc.sc_edi = tf->tf_edi;
frame.sf_sc.sc_esi = tf->tf_esi; frame.sf_sc.sc_esi = tf->tf_esi;
frame.sf_sc.sc_ebp = tf->tf_ebp; frame.sf_sc.sc_ebp = tf->tf_ebp;