d/freebsd-nq
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Move the elf linux_interp structure from the lkm stub to here so that it

Browse Source 
can be referenced when the linux emulator is statically compiled into the
kernel.
This commit is contained in:
Peter Wemm 1996-03-10 22:42:16 +00:00
parent 8191d577aa
commit 5cf588eb8b
2 changed files with 36 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
sys/alpha/linux/linux_sysvec.c
View File

@ -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

19
sys/i386/linux/linux_sysvec.c
View File

@ -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