Date: Mon, 8 Mar 2010 06:00:42 +0000 (UTC) From: Nathan Whitehorn <nwhitehorn@FreeBSD.org> To: src-committers@freebsd.org, svn-src-projects@freebsd.org Subject: svn commit: r204858 - in projects/ppc64/sys: amd64/conf amd64/linux32 i386/linux ia64/conf Message-ID: <201003080600.o2860gnt098726@svn.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: nwhitehorn Date: Mon Mar 8 06:00:42 2010 New Revision: 204858 URL: http://svn.freebsd.org/changeset/base/204858 Log: Unbreak ia64, i386, and amd64 builds due to changes to the 32-bit compat build options and to exec_setregs. Modified: projects/ppc64/sys/amd64/conf/NOTES projects/ppc64/sys/amd64/linux32/linux32_sysvec.c projects/ppc64/sys/i386/linux/linux_sysvec.c projects/ppc64/sys/ia64/conf/NOTES Modified: projects/ppc64/sys/amd64/conf/NOTES ============================================================================== --- projects/ppc64/sys/amd64/conf/NOTES Mon Mar 8 05:19:56 2010 (r204857) +++ projects/ppc64/sys/amd64/conf/NOTES Mon Mar 8 06:00:42 2010 (r204858) @@ -484,6 +484,7 @@ options PMAP_SHPGPERPROC=201 # Enable 32-bit runtime support for FreeBSD/i386 binaries. options COMPAT_IA32 +options COMPAT_FREEBSD32 # Enable iBCS2 runtime support for SCO and ISC binaries #XXX#options IBCS2 Modified: projects/ppc64/sys/amd64/linux32/linux32_sysvec.c ============================================================================== --- projects/ppc64/sys/amd64/linux32/linux32_sysvec.c Mon Mar 8 05:19:56 2010 (r204857) +++ projects/ppc64/sys/amd64/linux32/linux32_sysvec.c Mon Mar 8 06:00:42 2010 (r204858) @@ -125,7 +125,8 @@ static void linux_prepsyscall(struct tra caddr_t *params); static void linux_sendsig(sig_t catcher, ksiginfo_t *ksi, sigset_t *mask); static void exec_linux_setregs(struct thread *td, u_long entry, - u_long stack, u_long ps_strings); + u_long stack, u_long ps_strings, + struct image_params *imgp); static void linux32_fixlimit(struct rlimit *rl, int which); static boolean_t linux32_trans_osrel(const Elf_Note *note, int32_t *osrel); Modified: projects/ppc64/sys/i386/linux/linux_sysvec.c ============================================================================== --- projects/ppc64/sys/i386/linux/linux_sysvec.c Mon Mar 8 05:19:56 2010 (r204857) +++ projects/ppc64/sys/i386/linux/linux_sysvec.c Mon Mar 8 06:00:42 2010 (r204858) @@ -932,7 +932,7 @@ exec_linux_setregs(struct thread *td, u_ { struct pcb *pcb = td->td_pcb; - exec_setregs(td, entry, stack, ps_strings); + exec_setregs(td, entry, stack, ps_strings, imgp); /* Linux sets %gs to 0, we default to _udatasel */ pcb->pcb_gs = 0; Modified: projects/ppc64/sys/ia64/conf/NOTES ============================================================================== --- projects/ppc64/sys/ia64/conf/NOTES Mon Mar 8 05:19:56 2010 (r204857) +++ projects/ppc64/sys/ia64/conf/NOTES Mon Mar 8 06:00:42 2010 (r204858) @@ -12,10 +12,11 @@ cpu ITANIUM cpu ITANIUM2 -# option: COMPAT_IA32 -# This option enables the support for execution of i386 (32-bit) programs on +# options: COMPAT_IA32, COMPAT_FREEBSD32 +# These options enable the support for execution of i386 (32-bit) programs on # ia64. It is based on the ia32 emulation in the processor. options COMPAT_IA32 +options COMPAT_FREEBSD32 # option: LOG2_ID_PAGE_SIZE # Specify the log2 size of the identity (direct) mappings in regions 6 and 7
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201003080600.o2860gnt098726>