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

I'm not sure what tjr envisioned for turning on FreeBSD/i386 rt support,

Browse Source 
but make it COMPAT_IA32 for now.
Fix the 'DEBUG' argument code to unbreak the amd64 LINT build.
This commit is contained in:
obrien 2004-08-16 11:09:59 +00:00
parent 4a77056b79
commit 34f40785ef
3 changed files with 7 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
sys/amd64/conf/NOTES
View File

@ -456,6 +456,9 @@ options PMAP_SHPGPERPROC=201
#XXX keep these here for now and reactivate when support for emulating
#XXX these 32 bit binaries is added.
# Enable 32-bit runtime support for FreeBSD/i386 binaries.
options COMPAT_IA32
# Enable iBCS2 runtime support for SCO and ISC binaries
#XXX#options IBCS2

7
sys/amd64/linux32/linux32_sysvec.c
View File

@ -35,12 +35,11 @@ __FBSDID("$FreeBSD$");
/* XXX we use functions that might not exist. */
#include "opt_compat.h"
#include "opt_ia32.h"
#ifndef COMPAT_43
#error "Unable to compile Linux-emulator due to missing COMPAT_43 option!"
#endif
#ifndef IA32
#ifndef COMPAT_IA32
#error "Unable to compile Linux-emulator due to missing IA32 option!"
#endif
@ -366,7 +365,7 @@ linux_rt_sendsig(sig_t catcher, int sig, sigset_t *mask, u_long code)
#ifdef DEBUG
if (ldebug(rt_sendsig))
printf(LMSG("rt_sendsig flags: 0x%x, sp: %p, ss: 0x%x, mask: 0x%x"),
printf(LMSG("rt_sendsig flags: 0x%x, sp: %p, ss: 0x%lx, mask: 0x%x"),
frame.sf_sc.uc_stack.ss_flags, td->td_sigstk.ss_sp,
td->td_sigstk.ss_size, frame.sf_sc.uc_mcontext.sc_mask);
#endif
@ -709,7 +708,7 @@ linux_rt_sigreturn(struct thread *td, struct linux_rt_sigreturn_args *args)
#ifdef DEBUG
if (ldebug(rt_sigreturn))
printf(LMSG("rt_sigret flags: 0x%x, sp: %p, ss: 0x%x, mask: 0x%x"),
printf(LMSG("rt_sigret flags: 0x%x, sp: %p, ss: 0x%lx, mask: 0x%x"),
ss.ss_flags, ss.ss_sp, ss.ss_size, context->sc_mask);
#endif
(void)kern_sigaltstack(td, &ss, NULL);

2
sys/conf/options.amd64
View File

@ -10,6 +10,7 @@ PMAP_SHPGPERPROC opt_pmap.h
# Options for emulators. These should only be used at config time, so
# they are handled like options for static filesystems
# (see src/sys/conf/options), except for broken debugging options.
COMPAT_IA32 opt_compat.h
#IBCS2 opt_dontuse.h
#COMPAT_LINUX opt_dontuse.h
COMPAT_LINUX32 opt_compat.h
@ -52,6 +53,5 @@ PPC_DEBUG opt_ppc.h
PSM_HOOKRESUME opt_psm.h
PSM_RESETAFTERSUSPEND opt_psm.h
PSM_DEBUG opt_psm.h
IA32
NO_MIXED_MODE
DEV_ATPIC opt_atpic.h