Date: Sat, 19 Dec 1998 12:18:06 -0600 From: "Richard Seaman, Jr." <dick@tar.com> To: =?iso-8859-1?Q?S=F8ren?= Schmidt <sos@freebsd.dk>, Julian Elischer <julian@FreeBSD.ORG> Cc: cvs-all@FreeBSD.ORG Subject: Re: cvs commit: src/bin/ps keyword.c src/lib/libc/i386/sys sigsuspend.S src/sys/i386/linux linux.h linux_dummy.c linux_misc. Message-ID: <367BEDDE.195A7E7D@tar.com> References: <199812191625.RAA07772@freebsd.dk>
next in thread | previous in thread | raw e-mail | index | archive | help
"Søren Schmidt" wrote:
> It also break make world, because linux_sysvec.c is now an #ifdef
> nightmare that came true....
The following patch appears to allow the linux module to build
correctly on my machine (I'm still doing a full "make world"
so I don't have the results of that).
Note: I'm not sure exactly how the option COMPAT_LINUX_THREADS
gets propagated everywhere it needs to. At the moment I'm
doing a make world with -DCOMPAT_LINUX_THREADS on the command
line, as well defined as a kernel option.
*** linux_sysvec.c.orig Sat Dec 19 12:09:59 1998
--- linux_sysvec.c Sat Dec 19 12:10:30 1998
***************
*** 232,243 ****
grow_stack (p, (int)fp) == FALSE)) ||
#else
if ((grow_stack (p, (int)fp) == FALSE) ||
! #endif
#else
- #endif /* COMPAT_LINUX_THREADS */
if ((grow(p, (int)fp) == FALSE) ||
- #ifdef COMPAT_LINUX_THREADS
- #endif
#endif /* COMPAT_LINUX_THREADS */
(useracc((caddr_t)fp, sizeof (struct linux_sigframe), B_WRITE) == FALSE)) {
/*
--- 232,243 ----
grow_stack (p, (int)fp) == FALSE)) ||
#else
if ((grow_stack (p, (int)fp) == FALSE) ||
! #endif /* USE_VM_STACK_FOR_EXEC */
! #else
! if ((grow(p, (int)fp) == FALSE) ||
! #endif /* USE_VM_STACK */
#else
if ((grow(p, (int)fp) == FALSE) ||
#endif /* COMPAT_LINUX_THREADS */
(useracc((caddr_t)fp, sizeof (struct linux_sigframe), B_WRITE) == FALSE)) {
/*
--
Richard Seamman, Jr. email: dick@tar.com
5182 N. Maple Lane phone: 414-367-5450
Chenequa WI 53058 fax: 414-367-5852
To Unsubscribe: send mail to majordomo@FreeBSD.org
with "unsubscribe cvs-all" in the body of the message
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?367BEDDE.195A7E7D>