From owner-freebsd-emulation  Wed Aug 18  2:39: 6 1999
Delivered-To: freebsd-emulation@freebsd.org
Received: from godzilla.zeta.org.au (godzilla.zeta.org.au [203.26.10.9])
	by hub.freebsd.org (Postfix) with ESMTP
	id 5707B1582E; Wed, 18 Aug 1999 02:38:58 -0700 (PDT)
	(envelope-from bde@godzilla.zeta.org.au)
Received: (from bde@localhost)
	by godzilla.zeta.org.au (8.8.7/8.8.7) id TAA23772;
	Wed, 18 Aug 1999 19:36:50 +1000
Date: Wed, 18 Aug 1999 19:36:50 +1000
From: Bruce Evans <bde@zeta.org.au>
Message-Id: <199908180936.TAA23772@godzilla.zeta.org.au>
To: bde@zeta.org.au, marcel@scc.nl
Subject: Re: linux emulation in 3.2 current
Cc: alk@pobox.com, emulation@FreeBSD.ORG, stable@FreeBSD.ORG
Sender: owner-freebsd-emulation@FreeBSD.ORG
Precedence: bulk
X-Loop: FreeBSD.org

>====
>diff -u -r1.6 -r1.7
>--- src/sys/i386/conf/options.i386      1996/03/02 19:37:35     1.6
>+++ src/sys/i386/conf/options.i386      1996/03/15 07:49:47     1.7
>@@ -9,4 +9,3 @@
> LARGEMEM               opt_machdep.h
> MAXMEM                 opt_machdep.h
> LINUX                  opt_linux.h
>-COMPAT_LINUX           opt_linux.h
>====
>
>The log does reflect the actual change.

But doesn't affect the fact that COMPAT_LINUX is an option.  This part of
the change just breaks support for COMPAT_LINUX as a new-style option
-- it moves the definition of COMPAT_LINUX from opt_linux.h to the
generated Makefile.  References to COMPAT_LINUX (in lower case) still
existed in files.i386 (and still exist now).  If COMPAT_LINUX is _not_
an option, then config(8) also generates a header compat_linux.h that
defines NCOMPAT_LINUX.  config(8) still has this wart.  Some device
drivers depend on it.

>====
>diff -u -r1.11 -r1.12
>--- src/sys/i386/conf/options.i386      1996/04/26 06:44:46     1.11
>+++ src/sys/i386/conf/options.i386      1996/05/01 03:30:04     1.12
>@@ -1,4 +1,4 @@
>-#      $Id: options.i386,v 1.11 1996/04/26 06:44:46 sos Exp $
>+#      $Id: options.i386,v 1.12 1996/05/01 03:30:04 bde Exp $
> BOUNCEPAGES            opt_bounce.h
> USER_LDT
> MATH_EMULATE           opt_math_emulate.h
>@@ -8,7 +8,6 @@
> PANIC_REBOOT_WAIT_TIME opt_machdep.h
> LARGEMEM               opt_machdep.h
> MAXMEM                 opt_machdep.h
>-LINUX                  opt_linux.h
> PERFMON                        opt_perfmon.h
> AUTO_EOI_1             opt_auto_eoi.h
> AUTO_EOI_2             opt_auto_eoi.h
>====
>
>At this time, both COMPAT_LINUX and LINUX are gone.

This change is correct, since `LINUX' isn't an option at all.

>====
>diff -u -r1.12 -r1.13
>--- src/sys/i386/conf/options.i386      1996/05/01 03:30:04     1.12
>+++ src/sys/i386/conf/options.i386      1996/05/11 04:39:44     1.13
>@@ -1,9 +1,12 @@
>-#      $Id: options.i386,v 1.12 1996/05/01 03:30:04 bde Exp $
>+#      $Id: options.i386,v 1.13 1996/05/11 04:39:44 bde Exp $
> BOUNCEPAGES            opt_bounce.h
> USER_LDT
> MATH_EMULATE           opt_math_emulate.h
> GPL_MATH_EMULATE       opt_math_emulate.h
>-IBCS2                  opt_ibcs2.h
>+
>+IBCS2                  opt_dontuse.h
>+COMPAT_LINUX           opt_dontuse.h
>+
> SHOW_BUSYBUFS          opt_machdep.h
> PANIC_REBOOT_WAIT_TIME opt_machdep.h
> LARGEMEM               opt_machdep.h
>====
>
>This change is accompanied by the following log:
>Hide options for emulators and static file systems in opt_dontuse.h.
>These options only apply at config time.  Using them at compile time
>would break the corresponding lkms.
>
>Can you explain all this to me then?

No better than in the log message :-).  sys/conf/options says it a
little differently.

We now have the bogus option `LINUX' in options.i386 again.  It rotted
back in options.i386 rev.1.78 and was fixed wrong in rev.1.81.

Bruce


To Unsubscribe: send mail to majordomo@FreeBSD.org
with "unsubscribe freebsd-emulation" in the body of the message