summaryrefslogtreecommitdiffstats
path: root/sys/i386/conf
diff options
context:
space:
mode:
authorpeter <peter@FreeBSD.org>1996-03-02 19:38:20 +0000
committerpeter <peter@FreeBSD.org>1996-03-02 19:38:20 +0000
commit8465726bdae0892d85c26b32cd01d2f6936303ef (patch)
tree83b4d342a731e2a76c19f214d574f24753abe420 /sys/i386/conf
parent8283a18c8bf4ad6c988d73b3290e9d4b4a743ae3 (diff)
downloadFreeBSD-src-8465726bdae0892d85c26b32cd01d2f6936303ef.zip
FreeBSD-src-8465726bdae0892d85c26b32cd01d2f6936303ef.tar.gz
Mega-commit for Linux emulator update.. This has been stress tested under
netscape-2.0 for Linux running all the Java stuff. The scrollbars are now working, at least on my machine. (whew! :-) I'm uncomfortable with the size of this commit, but it's too inter-dependant to easily seperate out. The main changes: COMPAT_LINUX is *GONE*. Most of the code has been moved out of the i386 machine dependent section into the linux emulator itself. The int 0x80 syscall code was almost identical to the lcall 7,0 code and a minor tweak allows them to both be used with the same C code. All kernels can now just modload the lkm and it'll DTRT without having to rebuild the kernel first. Like IBCS2, you can statically compile it in with "options LINUX". A pile of new syscalls implemented, including getdents(), llseek(), readv(), writev(), msync(), personality(). The Linux-ELF libraries want to use some of these. linux_select() now obeys Linux semantics, ie: returns the time remaining of the timeout value rather than leaving it the original value. Quite a few bugs removed, including incorrect arguments being used in syscalls.. eg: mixups between passing the sigset as an int, vs passing it as a pointer and doing a copyin(), missing return values, unhandled cases, SIOC* ioctls, etc. The build for the code has changed. i386/conf/files now knows how to build linux_genassym and generate linux_assym.h on the fly. Supporting changes elsewhere in the kernel: The user-mode signal trampoline has moved from the U area to immediately below the top of the stack (below PS_STRINGS). This allows the different binary emulations to have their own signal trampoline code (which gets rid of the hardwired syscall 103 (sigreturn on BSD, syslog on Linux)) and so that the emulator can provide the exact "struct sigcontext *" argument to the program's signal handlers. The sigstack's "ss_flags" now uses SS_DISABLE and SS_ONSTACK flags, which have the same values as the re-used SA_DISABLE and SA_ONSTACK which are intended for sigaction only. This enables the support of a SA_RESETHAND flag to sigaction to implement the gross SYSV and Linux SA_ONESHOT signal semantics where the signal handler is reset when it's triggered. makesyscalls.sh no longer appends the struct sysentvec on the end of the generated init_sysent.c code. It's a lot saner to have it in a seperate file rather than trying to update the structure inside the awk script. :-) At exec time, the dozen bytes or so of signal trampoline code are copied to the top of the user's stack, rather than obtaining the trampoline code the old way by getting a clone of the parent's user area. This allows Linux and native binaries to freely exec each other without getting trampolines mixed up.
Diffstat (limited to 'sys/i386/conf')
-rw-r--r--sys/i386/conf/LINT3
-rw-r--r--sys/i386/conf/Makefile.i3865
-rw-r--r--sys/i386/conf/NOTES3
-rw-r--r--sys/i386/conf/files.i38623
-rw-r--r--sys/i386/conf/options.i3862
5 files changed, 25 insertions, 11 deletions
diff --git a/sys/i386/conf/LINT b/sys/i386/conf/LINT
index ce1bae2..c2e6a38 100644
--- a/sys/i386/conf/LINT
+++ b/sys/i386/conf/LINT
@@ -2,7 +2,7 @@
# LINT -- config file for checking all the sources, tries to pull in
# as much of the source tree as it can.
#
-# $Id: LINT,v 1.240 1996/02/23 15:47:41 phk Exp $
+# $Id: LINT,v 1.241 1996/02/28 21:39:54 gpalmer Exp $
#
# NB: You probably don't want to try running a kernel built from this
# file. Instead, you should start from GENERIC, and add options from
@@ -846,7 +846,6 @@ options POWERFAIL_NMI # make it beep instead of panicing
# More undocumented options for linting.
options APM_SLOWSTART=1
-options COMPAT_LINUX
options DEBUG
options "EXT2FS"
options "IBCS2"
diff --git a/sys/i386/conf/Makefile.i386 b/sys/i386/conf/Makefile.i386
index f88dd84..3ba84a5 100644
--- a/sys/i386/conf/Makefile.i386
+++ b/sys/i386/conf/Makefile.i386
@@ -1,6 +1,6 @@
# Copyright 1990 W. Jolitz
# from: @(#)Makefile.i386 7.1 5/10/91
-# $Id: Makefile.i386,v 1.74 1996/01/07 22:31:27 phk Exp $
+# $Id: Makefile.i386,v 1.75 1996/01/08 03:55:36 peter Exp $
#
# Makefile for FreeBSD
#
@@ -136,7 +136,8 @@ genassym: genassym.o
# XXX this assumes that the options for NORMAL_C* and DRIVER_C* are identical.
depend: assym.s param.c vnode_if.h ${BEFORE_DEPEND}
- mkdep ${COPTS} ${CFILES} ${SYSTEM_CFILES}
+ rm -f .depend
+ mkdep -a ${COPTS} ${CFILES} ${SYSTEM_CFILES}
mkdep -a ${COPTS} ${PARAM} -UKERNEL ${I386}/i386/genassym.c
MKDEP_CPP=${CPP} ; export MKDEP_CPP ; \
mkdep -a -DLOCORE ${COPTS} ${SFILES} ${SYSTEM_SFILES}
diff --git a/sys/i386/conf/NOTES b/sys/i386/conf/NOTES
index ce1bae2..c2e6a38 100644
--- a/sys/i386/conf/NOTES
+++ b/sys/i386/conf/NOTES
@@ -2,7 +2,7 @@
# LINT -- config file for checking all the sources, tries to pull in
# as much of the source tree as it can.
#
-# $Id: LINT,v 1.240 1996/02/23 15:47:41 phk Exp $
+# $Id: LINT,v 1.241 1996/02/28 21:39:54 gpalmer Exp $
#
# NB: You probably don't want to try running a kernel built from this
# file. Instead, you should start from GENERIC, and add options from
@@ -846,7 +846,6 @@ options POWERFAIL_NMI # make it beep instead of panicing
# More undocumented options for linting.
options APM_SLOWSTART=1
-options COMPAT_LINUX
options DEBUG
options "EXT2FS"
options "IBCS2"
diff --git a/sys/i386/conf/files.i386 b/sys/i386/conf/files.i386
index bef328a..5c0bef2 100644
--- a/sys/i386/conf/files.i386
+++ b/sys/i386/conf/files.i386
@@ -1,18 +1,32 @@
# This file tells config what files go into building a kernel,
# files marked standard are always included.
#
-# $Id: files.i386,v 1.128 1996/02/26 00:58:38 gibbs Exp $
+# $Id: files.i386,v 1.129 1996/03/02 03:48:11 pst Exp $
#
aic7xxx_asm optional ahc device-driver \
dependency "$S/dev/aic7xxx/aic7xxx_asm.c" \
compile-with "${CC} -Wall -o $@ $>" \
no-obj no-implicit-rule \
clean "aic7xxx_asm"
+#
aic7xxx_seq.h optional ahc device-driver \
compile-with "./aic7xxx_asm -o $@ $S/dev/aic7xxx/aic7xxx.seq" \
no-obj no-implicit-rule before-depend \
clean "aic7xxx_seq.h" \
dependency "$S/dev/aic7xxx/aic7xxx_reg.h $S/dev/aic7xxx/aic7xxx.seq aic7xxx_asm"
+#
+linux_genassym optional linux \
+ dependency "$S/i386/linux/linux_genassym.c $S/i386/linux/linux.h" \
+ compile-with "${CC} ${CFLAGS} -o $@ $<" \
+ no-obj no-implicit-rule \
+ clean "linux_genassym"
+#
+linux_assym.h optional linux \
+ dependency "linux_genassym" \
+ compile-with "./linux_genassym > $@" \
+ no-obj no-implicit-rule before-depend \
+ clean "linux_assym.h"
+#
i386/scsi/93cx6.c optional ahc device-driver
i386/apm/apm.c optional apm device-driver
i386/apm/apm_setup.s optional apm
@@ -37,7 +51,6 @@ i386/i386/mem.c standard
i386/i386/microtime.s standard
i386/i386/ns_cksum.c optional ns
i386/i386/pmap.c standard
-# used by ptrace now
i386/i386/procfs_machdep.c standard
i386/i386/support.s standard
i386/i386/swtch.s standard
@@ -64,8 +77,6 @@ i386/ibcs2/ibcs2_errno.c optional ibcs2
i386/ibcs2/ibcs2_sysent.c optional ibcs2
i386/ibcs2/ibcs2_sysvec.c optional ibcs2
i386/ibcs2/imgact_coff.c optional ibcs2
-#i386/ibcs2/imgact_elf.c optional svr4
-#i386/ibcs2/imgact_xout.c optional ibcs2
i386/isa/aha1542.c optional aha device-driver
i386/isa/aic6360.c optional aic device-driver
i386/isa/ata.c optional ata device-driver
@@ -187,14 +198,16 @@ i386/isa/wt.c optional wt device-driver
i386/linux/imgact_linux.c optional linux
i386/linux/linux_dummy.c optional linux
i386/linux/linux_file.c optional linux
-i386/linux/linux_generic.c optional linux
i386/linux/linux_ioctl.c optional linux
i386/linux/linux_ipc.c optional linux
+i386/linux/linux_locore.s optional linux
i386/linux/linux_misc.c optional linux
i386/linux/linux_signal.c optional linux
i386/linux/linux_socket.c optional linux
i386/linux/linux_stats.c optional linux
i386/linux/linux_sysent.c optional linux
+i386/linux/linux_sysvec.c optional linux
+i386/linux/linux_util.c optional linux
i386/scsi/aic7xxx.c optional ahc device-driver \
dependency "$S/dev/aic7xxx/aic7xxx_reg.h aic7xxx_seq.h"
i386/scsi/bt.c optional bt device-driver
diff --git a/sys/i386/conf/options.i386 b/sys/i386/conf/options.i386
index b48ef2c..f30187d 100644
--- a/sys/i386/conf/options.i386
+++ b/sys/i386/conf/options.i386
@@ -8,3 +8,5 @@ SHOW_BUSYBUFS opt_machdep.h
PANIC_REBOOT_WAIT_TIME opt_machdep.h
LARGEMEM opt_machdep.h
MAXMEM opt_machdep.h
+LINUX opt_linux.h
+COMPAT_LINUX opt_linux.h
OpenPOWER on IntegriCloud