diff options
Diffstat (limited to 'sys/i386/svr4/svr4_machdep.c')
| -rw-r--r-- | sys/i386/svr4/svr4_machdep.c | 11 |
1 files changed, 11 insertions, 0 deletions
diff --git a/sys/i386/svr4/svr4_machdep.c b/sys/i386/svr4/svr4_machdep.c index a94f45e78cf8..5e77fd1ada54 100644 --- a/sys/i386/svr4/svr4_machdep.c +++ b/sys/i386/svr4/svr4_machdep.c @@ -127,8 +127,13 @@ svr4_getcontext(p, uc, mask, oonstack) } else #endif { +#if defined(__NetBSD__) __asm("movl %%gs,%w0" : "=r" (r[SVR4_X86_GS])); __asm("movl %%fs,%w0" : "=r" (r[SVR4_X86_FS])); +#else + r[SVR4_X86_GS] = rgs(); + r[SVR4_X86_FS] = tf->tf_fs; +#endif r[SVR4_X86_ES] = tf->tf_es; r[SVR4_X86_DS] = tf->tf_ds; r[SVR4_X86_EFL] = tf->tf_eflags; @@ -230,7 +235,12 @@ svr4_setcontext(p, uc) !USERMODE(r[SVR4_X86_CS], r[SVR4_X86_EFL])) return (EINVAL); +#if defined(__NetBSD__) /* %fs and %gs were restored by the trampoline. */ +#else + /* %gs was restored by the trampoline. */ + tf->tf_fs = r[SVR4_X86_FS]; +#endif tf->tf_es = r[SVR4_X86_ES]; tf->tf_ds = r[SVR4_X86_DS]; tf->tf_eflags = r[SVR4_X86_EFL]; @@ -449,6 +459,7 @@ svr4_sendsig(catcher, sig, mask, code) tf->tf_cs = _ucodesel; tf->tf_ds = _udatasel; tf->tf_es = _udatasel; + tf->tf_fs = _udatasel; tf->tf_ss = _udatasel; #endif } |