summaryrefslogtreecommitdiffstats
path: root/sys/i386/linux
diff options
context:
space:
mode:
authorpeter <peter@FreeBSD.org>1996-03-10 22:42:16 +0000
committerpeter <peter@FreeBSD.org>1996-03-10 22:42:16 +0000
commit7543251e29e59398e36da07dc2d671418b98545a (patch)
tree434d0ddb40cf7b34c325d7e035e3fdc2739dd3c4 /sys/i386/linux
parenta8cfe839f7b7893e64c40ad8dae5e14e69e25633 (diff)
downloadFreeBSD-src-7543251e29e59398e36da07dc2d671418b98545a.zip
FreeBSD-src-7543251e29e59398e36da07dc2d671418b98545a.tar.gz
Move the elf linux_interp structure from the lkm stub to here so that it
can be referenced when the linux emulator is statically compiled into the kernel.
Diffstat (limited to 'sys/i386/linux')
-rw-r--r--sys/i386/linux/linux_sysvec.c19
1 files changed, 18 insertions, 1 deletions
diff --git a/sys/i386/linux/linux_sysvec.c b/sys/i386/linux/linux_sysvec.c
index e7a72ae..c6316ae 100644
--- a/sys/i386/linux/linux_sysvec.c
+++ b/sys/i386/linux/linux_sysvec.c
@@ -25,7 +25,7 @@
* (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
* THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*
- * $Id: linux_sysvec.c,v 1.1 1996/03/02 19:38:01 peter Exp $
+ * $Id: linux_sysvec.c,v 1.2 1996/03/10 08:42:48 sos Exp $
*/
/* XXX we use functions that might not exist. */
@@ -51,6 +51,7 @@
#include <vm/vm_extern.h>
#include <sys/user.h>
#include <sys/exec.h>
+#include <sys/kernel.h>
#include <machine/cpu.h>
#include <machine/frame.h>
#include <machine/reg.h>
@@ -398,3 +399,19 @@ struct sysentvec elf_linux_sysvec = {
linux_prepsyscall,
};
+/*
+ * Installed either via SYSINIT() or via LKM stubs.
+ */
+Elf32_Interp_info linux_interp = {
+ &elf_linux_sysvec,
+ "/lib/ld-linux.so.1",
+ "/compat/linux"
+ };
+
+#ifndef LKM
+/*
+ * XXX: this is WRONG, it needs to be SI_SUB_EXEC, but this is just at the
+ * "proof of concept" stage and will be fixed shortly
+ */
+SYSINIT(linuxelf, SI_SUB_VFS, SI_ORDER_ANY, elf_insert_interp, &linux_interp);
+#endif
OpenPOWER on IntegriCloud