From owner-svn-src-projects@FreeBSD.ORG Mon Mar 8 06:00:43 2010 Return-Path: Delivered-To: svn-src-projects@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 76BB5106564A; Mon, 8 Mar 2010 06:00:43 +0000 (UTC) (envelope-from nwhitehorn@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c]) by mx1.freebsd.org (Postfix) with ESMTP id 5B2718FC23; Mon, 8 Mar 2010 06:00:43 +0000 (UTC) Received: from svn.freebsd.org (localhost [127.0.0.1]) by svn.freebsd.org (8.14.3/8.14.3) with ESMTP id o2860hMI098732; Mon, 8 Mar 2010 06:00:43 GMT (envelope-from nwhitehorn@svn.freebsd.org) Received: (from nwhitehorn@localhost) by svn.freebsd.org (8.14.3/8.14.3/Submit) id o2860gnt098726; Mon, 8 Mar 2010 06:00:42 GMT (envelope-from nwhitehorn@svn.freebsd.org) Message-Id: <201003080600.o2860gnt098726@svn.freebsd.org> From: Nathan Whitehorn Date: Mon, 8 Mar 2010 06:00:42 +0000 (UTC) To: src-committers@freebsd.org, svn-src-projects@freebsd.org X-SVN-Group: projects MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Cc: Subject: svn commit: r204858 - in projects/ppc64/sys: amd64/conf amd64/linux32 i386/linux ia64/conf X-BeenThere: svn-src-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: "SVN commit messages for the src " projects" tree" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 08 Mar 2010 06:00:43 -0000 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