svn commit: r204871 - in projects/ppc64/sys: amd64/amd64 amd64/conf amd64/linux32 conf fs/procfs ia64/conf ia64/ia64 kern modules/linux modules/procfs powerpc/include powerpc/powerpc powerpc64/conf

Nathan Whitehorn nwhitehorn at FreeBSD.org
Mon Mar 8 15:56:19 UTC 2010 

Author: nwhitehorn
Date: Mon Mar  8 15:56:18 2010
New Revision: 204871
URL: http://svn.freebsd.org/changeset/base/204871

Log:
  It turns out that the 32-bit linuxolator is strongly tied into in the
  32-bit bsdolater, and having separate COMPAT_{ARCH32,FREEBSD32,LINUX32)
  is basically unworkable. Kill COMPAT_ARCH32, and just make COMPAT_FREEBSD32
  a direct replacement for it.

Modified:
  projects/ppc64/sys/amd64/amd64/db_trace.c
  projects/ppc64/sys/amd64/amd64/exception.S
  projects/ppc64/sys/amd64/amd64/vm_machdep.c
  projects/ppc64/sys/amd64/conf/GENERIC
  projects/ppc64/sys/amd64/conf/NOTES
  projects/ppc64/sys/amd64/conf/XENHVM
  projects/ppc64/sys/amd64/linux32/linux32_sysvec.c
  projects/ppc64/sys/conf/files.amd64
  projects/ppc64/sys/conf/files.ia64
  projects/ppc64/sys/conf/files.powerpc64
  projects/ppc64/sys/conf/options.amd64
  projects/ppc64/sys/conf/options.ia64
  projects/ppc64/sys/conf/options.powerpc64
  projects/ppc64/sys/fs/procfs/procfs_dbregs.c
  projects/ppc64/sys/fs/procfs/procfs_fpregs.c
  projects/ppc64/sys/fs/procfs/procfs_ioctl.c
  projects/ppc64/sys/fs/procfs/procfs_map.c
  projects/ppc64/sys/fs/procfs/procfs_regs.c
  projects/ppc64/sys/ia64/conf/NOTES
  projects/ppc64/sys/ia64/ia64/exception.S
  projects/ppc64/sys/ia64/ia64/genassym.c
  projects/ppc64/sys/ia64/ia64/machdep.c
  projects/ppc64/sys/kern/imgact_elf.c
  projects/ppc64/sys/kern/kern_jail.c
  projects/ppc64/sys/kern/sys_process.c
  projects/ppc64/sys/modules/linux/Makefile
  projects/ppc64/sys/modules/procfs/Makefile
  projects/ppc64/sys/powerpc/include/elf.h
  projects/ppc64/sys/powerpc/include/reg.h
  projects/ppc64/sys/powerpc/powerpc/exec_machdep.c
  projects/ppc64/sys/powerpc64/conf/GENERIC

Modified: projects/ppc64/sys/amd64/amd64/db_trace.c
==============================================================================
--- projects/ppc64/sys/amd64/amd64/db_trace.c	Mon Mar  8 15:01:08 2010	(r204870)
+++ projects/ppc64/sys/amd64/amd64/db_trace.c	Mon Mar  8 15:56:18 2010	(r204871)
@@ -319,7 +319,7 @@ db_nextframe(struct amd64_frame **fp, db
 			frame_type = INTERRUPT;
 		else if (strcmp(name, "Xfast_syscall") == 0)
 			frame_type = SYSCALL;
-#ifdef COMPAT_IA32
+#ifdef COMPAT_FREEBSD32
 		else if (strcmp(name, "Xint0x80_syscall") == 0)
 			frame_type = SYSCALL;
 #endif

Modified: projects/ppc64/sys/amd64/amd64/exception.S
==============================================================================
--- projects/ppc64/sys/amd64/amd64/exception.S	Mon Mar  8 15:01:08 2010	(r204870)
+++ projects/ppc64/sys/amd64/amd64/exception.S	Mon Mar  8 15:56:18 2010	(r204871)
@@ -572,7 +572,7 @@ ENTRY(fork_trampoline)
  * included.
  */
 
-#ifdef COMPAT_IA32
+#ifdef COMPAT_FREEBSD32
 	.data
 	.p2align 4
 	.text

Modified: projects/ppc64/sys/amd64/amd64/vm_machdep.c
==============================================================================
--- projects/ppc64/sys/amd64/amd64/vm_machdep.c	Mon Mar  8 15:01:08 2010	(r204870)
+++ projects/ppc64/sys/amd64/amd64/vm_machdep.c	Mon Mar  8 15:56:18 2010	(r204871)
@@ -439,7 +439,7 @@ cpu_set_upcall_kse(struct thread *td, vo
 	 */
 	cpu_thread_clean(td);
 
-#ifdef COMPAT_IA32
+#ifdef COMPAT_FREEBSD32
 	if (td->td_proc->p_sysent->sv_flags & SV_ILP32) {
 		/*
 	 	 * Set the trap frame to point at the beginning of the uts
@@ -490,7 +490,7 @@ cpu_set_user_tls(struct thread *td, void
 	if ((u_int64_t)tls_base >= VM_MAXUSER_ADDRESS)
 		return (EINVAL);
 
-#ifdef COMPAT_IA32
+#ifdef COMPAT_FREBSD32
 	if (td->td_proc->p_sysent->sv_flags & SV_ILP32) {
 		td->td_pcb->pcb_gsbase = (register_t)tls_base;
 		return (0);

Modified: projects/ppc64/sys/amd64/conf/GENERIC
==============================================================================
--- projects/ppc64/sys/amd64/conf/GENERIC	Mon Mar  8 15:01:08 2010	(r204870)
+++ projects/ppc64/sys/amd64/conf/GENERIC	Mon Mar  8 15:56:18 2010	(r204871)
@@ -45,8 +45,7 @@ options 	PSEUDOFS		# Pseudo-filesystem f
 options 	GEOM_PART_GPT		# GUID Partition Tables.
 options 	GEOM_LABEL		# Provides labelization
 options 	COMPAT_43TTY		# BSD 4.3 TTY compat (sgtty)
-options 	COMPAT_IA32		# Compatible with i386 binaries
-options 	COMPAT_FREEBSD32	
+options 	COMPAT_FREEBSD32	# Compatible with i386 binaries
 options 	COMPAT_FREEBSD4		# Compatible with FreeBSD4
 options 	COMPAT_FREEBSD5		# Compatible with FreeBSD5
 options 	COMPAT_FREEBSD6		# Compatible with FreeBSD6

Modified: projects/ppc64/sys/amd64/conf/NOTES
==============================================================================
--- projects/ppc64/sys/amd64/conf/NOTES	Mon Mar  8 15:01:08 2010	(r204870)
+++ projects/ppc64/sys/amd64/conf/NOTES	Mon Mar  8 15:56:18 2010	(r204871)
@@ -483,7 +483,6 @@ options 	PMAP_SHPGPERPROC=201
 #XXX these 32 bit binaries is added.
 
 # Enable 32-bit runtime support for FreeBSD/i386 binaries.
-options 	COMPAT_IA32
 options		COMPAT_FREEBSD32
 
 # Enable iBCS2 runtime support for SCO and ISC binaries
@@ -495,7 +494,7 @@ options		COMPAT_FREEBSD32
 # Enable Linux ABI emulation
 #XXX#options 	COMPAT_LINUX
 
-# Enable 32-bit Linux ABI emulation (requires COMPAT_43 and COMPAT_IA32)
+# Enable 32-bit Linux ABI emulation (requires COMPAT_43 and COMPAT_FREEBSD32)
 options 	COMPAT_LINUX32
 
 # Enable the linux-like proc filesystem support (requires COMPAT_LINUX32

Modified: projects/ppc64/sys/amd64/conf/XENHVM
==============================================================================
--- projects/ppc64/sys/amd64/conf/XENHVM	Mon Mar  8 15:01:08 2010	(r204870)
+++ projects/ppc64/sys/amd64/conf/XENHVM	Mon Mar  8 15:56:18 2010	(r204871)
@@ -46,7 +46,7 @@ options 	PSEUDOFS		# Pseudo-filesystem f
 options 	GEOM_PART_GPT		# GUID Partition Tables.
 options 	GEOM_LABEL		# Provides labelization
 options 	COMPAT_43TTY		# BSD 4.3 TTY compat (sgtty)
-options 	COMPAT_IA32		# Compatible with i386 binaries
+options 	COMPAT_FREEBSD32	# Compatible with i386 binaries
 options 	COMPAT_FREEBSD4		# Compatible with FreeBSD4
 options 	COMPAT_FREEBSD5		# Compatible with FreeBSD5
 options 	COMPAT_FREEBSD6		# Compatible with FreeBSD6

Modified: projects/ppc64/sys/amd64/linux32/linux32_sysvec.c
==============================================================================
--- projects/ppc64/sys/amd64/linux32/linux32_sysvec.c	Mon Mar  8 15:01:08 2010	(r204870)
+++ projects/ppc64/sys/amd64/linux32/linux32_sysvec.c	Mon Mar  8 15:56:18 2010	(r204871)
@@ -34,8 +34,8 @@
 __FBSDID("$FreeBSD$");
 #include "opt_compat.h"
 
-#ifndef COMPAT_IA32
-#error "Unable to compile Linux-emulator due to missing COMPAT_IA32 option!"
+#ifndef COMPAT_FREEBSD32
+#error "Unable to compile Linux-emulator due to missing COMPAT_FREEBSD32 option!"
 #endif
 
 #define	__ELF_WORD_SIZE	32

Modified: projects/ppc64/sys/conf/files.amd64
==============================================================================
--- projects/ppc64/sys/conf/files.amd64	Mon Mar  8 15:01:08 2010	(r204870)
+++ projects/ppc64/sys/conf/files.amd64	Mon Mar  8 15:56:18 2010	(r204871)
@@ -236,20 +236,20 @@ kern/link_elf_obj.c		standard
 #
 # IA32 binary support
 #
-#amd64/ia32/ia32_exception.S	optional	compat_ia32
-amd64/ia32/ia32_reg.c		optional	compat_ia32
-amd64/ia32/ia32_signal.c	optional	compat_ia32
-amd64/ia32/ia32_sigtramp.S	optional	compat_ia32
-amd64/ia32/ia32_syscall.c	optional	compat_ia32
-amd64/ia32/ia32_misc.c		optional	compat_ia32
+#amd64/ia32/ia32_exception.S	optional	compat_freebsd32
+amd64/ia32/ia32_reg.c		optional	compat_freebsd32
+amd64/ia32/ia32_signal.c	optional	compat_freebsd32
+amd64/ia32/ia32_sigtramp.S	optional	compat_freebsd32
+amd64/ia32/ia32_syscall.c	optional	compat_freebsd32
+amd64/ia32/ia32_misc.c		optional	compat_freebsd32
 compat/freebsd32/freebsd32_ioctl.c	optional	compat_freebsd32
 compat/freebsd32/freebsd32_misc.c	optional	compat_freebsd32
 compat/freebsd32/freebsd32_syscalls.c	optional	compat_freebsd32
 compat/freebsd32/freebsd32_sysent.c	optional	compat_freebsd32
-compat/ia32/ia32_sysvec.c	optional	compat_ia32
+compat/ia32/ia32_sysvec.c	optional	compat_freebsd32
 compat/linprocfs/linprocfs.c	optional	linprocfs
 compat/linsysfs/linsysfs.c	optional	linsysfs
-kern/imgact_elf32.c		optional	compat_ia32
+kern/imgact_elf32.c		optional	compat_freebsd32
 #
 # Linux/i386 binary support
 #

Modified: projects/ppc64/sys/conf/files.ia64
==============================================================================
--- projects/ppc64/sys/conf/files.ia64	Mon Mar  8 15:01:08 2010	(r204870)
+++ projects/ppc64/sys/conf/files.ia64	Mon Mar  8 15:56:18 2010	(r204871)
@@ -32,7 +32,7 @@ compat/freebsd32/freebsd32_ioctl.c	optio
 compat/freebsd32/freebsd32_misc.c	optional	compat_freebsd32
 compat/freebsd32/freebsd32_syscalls.c	optional	compat_freebsd32
 compat/freebsd32/freebsd32_sysent.c	optional	compat_freebsd32
-compat/ia32/ia32_sysvec.c		optional	compat_ia32
+compat/ia32/ia32_sysvec.c		optional	compat_freebsd32
 contrib/ia64/libuwx/src/uwx_bstream.c		standard
 contrib/ia64/libuwx/src/uwx_context.c		standard
 contrib/ia64/libuwx/src/uwx_env.c		standard
@@ -68,10 +68,10 @@ ia64/acpica/madt.c		optional	acpi
 ia64/disasm/disasm_decode.c	standard
 ia64/disasm/disasm_extract.c	standard
 ia64/disasm/disasm_format.c	standard
-ia64/ia32/ia32_misc.c		optional	compat_ia32
-ia64/ia32/ia32_reg.c		optional	compat_ia32
-ia64/ia32/ia32_signal.c		optional	compat_ia32
-ia64/ia32/ia32_trap.c		optional	compat_ia32
+ia64/ia32/ia32_misc.c		optional	compat_freebsd32
+ia64/ia32/ia32_reg.c		optional	compat_freebsd32
+ia64/ia32/ia32_signal.c		optional	compat_freebsd32
+ia64/ia32/ia32_trap.c		optional	compat_freebsd32
 ia64/ia64/autoconf.c		standard
 ia64/ia64/bus_machdep.c		standard
 ia64/ia64/busdma_machdep.c	standard
@@ -117,7 +117,7 @@ ia64/isa/isa_dma.c		optional	isa
 ia64/pci/pci_cfgreg.c		optional	pci
 isa/syscons_isa.c		optional	sc
 isa/vga_isa.c			optional	vga
-kern/imgact_elf32.c		optional	compat_ia32
+kern/imgact_elf32.c		optional	compat_freebsd32
 libkern/bcmp.c			standard
 libkern/ffsl.c			standard
 libkern/fls.c			standard

Modified: projects/ppc64/sys/conf/files.powerpc64
==============================================================================
--- projects/ppc64/sys/conf/files.powerpc64	Mon Mar  8 15:01:08 2010	(r204870)
+++ projects/ppc64/sys/conf/files.powerpc64	Mon Mar  8 15:56:18 2010	(r204871)
@@ -137,5 +137,5 @@ compat/freebsd32/freebsd32_ioctl.c	optio
 compat/freebsd32/freebsd32_misc.c	optional	compat_freebsd32
 compat/freebsd32/freebsd32_syscalls.c	optional	compat_freebsd32
 compat/freebsd32/freebsd32_sysent.c	optional	compat_freebsd32
-kern/imgact_elf32.c			optional	compat_ppc32
+kern/imgact_elf32.c			optional	compat_freebsd32
 

Modified: projects/ppc64/sys/conf/options.amd64
==============================================================================
--- projects/ppc64/sys/conf/options.amd64	Mon Mar  8 15:01:08 2010	(r204870)
+++ projects/ppc64/sys/conf/options.amd64	Mon Mar  8 15:56:18 2010	(r204871)
@@ -11,7 +11,6 @@ MP_WATCHDOG
 # 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
 COMPAT_FREEBSD32	opt_compat.h
 #IBCS2			opt_dontuse.h
 #COMPAT_LINUX		opt_dontuse.h

Modified: projects/ppc64/sys/conf/options.ia64
==============================================================================
--- projects/ppc64/sys/conf/options.ia64	Mon Mar  8 15:01:08 2010	(r204870)
+++ projects/ppc64/sys/conf/options.ia64	Mon Mar  8 15:56:18 2010	(r204871)
@@ -9,7 +9,6 @@ LOG2_PAGE_SIZE		opt_global.h
 
 UWX_TRACE_ENABLE	opt_global.h
 
-COMPAT_IA32		opt_compat.h
 COMPAT_FREEBSD32	opt_compat.h
 
 EXCEPTION_TRACING	opt_xtrace.h

Modified: projects/ppc64/sys/conf/options.powerpc64
==============================================================================
--- projects/ppc64/sys/conf/options.powerpc64	Mon Mar  8 15:01:08 2010	(r204870)
+++ projects/ppc64/sys/conf/options.powerpc64	Mon Mar  8 15:56:18 2010	(r204871)
@@ -6,7 +6,6 @@ E500			opt_global.h
 CELL
 MAMBO
 
-COMPAT_PPC32		opt_compat.h
 COMPAT_FREEBSD32	opt_compat.h
 
 GFB_DEBUG		opt_gfb.h

Modified: projects/ppc64/sys/fs/procfs/procfs_dbregs.c
==============================================================================
--- projects/ppc64/sys/fs/procfs/procfs_dbregs.c	Mon Mar  8 15:01:08 2010	(r204870)
+++ projects/ppc64/sys/fs/procfs/procfs_dbregs.c	Mon Mar  8 15:56:18 2010	(r204871)
@@ -59,10 +59,13 @@
 #include <fs/pseudofs/pseudofs.h>
 #include <fs/procfs/procfs.h>
 
-#ifdef COMPAT_IA32
+#ifdef COMPAT_FREEBSD32
 #include <sys/procfs.h>
 #include <machine/fpu.h>
+
+#if defined(__amd64__) || defined(__ia64__)
 #include <compat/ia32/ia32_reg.h>
+#endif
 
 /*
  * PROC(write, dbregs, td2, &r) becomes
@@ -90,7 +93,7 @@ procfs_doprocdbregs(PFS_FILL_ARGS)
 	int error;
 	struct dbreg r;
 	struct thread *td2;
-#ifdef COMPAT_IA32
+#ifdef COMPAT_FREEBSD32
 	struct dbreg32 r32;
 	int wrap32 = 0;
 #endif
@@ -106,7 +109,7 @@ procfs_doprocdbregs(PFS_FILL_ARGS)
 	}
 
 	td2 = FIRST_THREAD_IN_PROC(p);
-#ifdef COMPAT_IA32
+#ifdef COMPAT_FREEBSD32
 	if (SV_CURPROC_FLAG(SV_ILP32)) {
 		if ((td2->td_proc->p_sysent->sv_flags & SV_ILP32) == 0) {
 			PROC_UNLOCK(p);

Modified: projects/ppc64/sys/fs/procfs/procfs_fpregs.c
==============================================================================
--- projects/ppc64/sys/fs/procfs/procfs_fpregs.c	Mon Mar  8 15:01:08 2010	(r204870)
+++ projects/ppc64/sys/fs/procfs/procfs_fpregs.c	Mon Mar  8 15:56:18 2010	(r204871)
@@ -53,10 +53,13 @@
 #include <fs/pseudofs/pseudofs.h>
 #include <fs/procfs/procfs.h>
 
-#ifdef COMPAT_IA32
+#ifdef COMPAT_FREEBSD32
 #include <sys/procfs.h>
 #include <machine/fpu.h>
+
+#if defined(__amd64__) || defined(__ia64__)
 #include <compat/ia32/ia32_reg.h>
+#endif
 
 /*
  * PROC(write, fpregs, td2, &r) becomes
@@ -84,7 +87,7 @@ procfs_doprocfpregs(PFS_FILL_ARGS)
 	int error;
 	struct fpreg r;
 	struct thread *td2;
-#ifdef COMPAT_IA32
+#ifdef COMPAT_FREEBSD32
 	struct fpreg32 r32;
 	int wrap32 = 0;
 #endif
@@ -101,7 +104,7 @@ procfs_doprocfpregs(PFS_FILL_ARGS)
 
 	/* XXXKSE: */
 	td2 = FIRST_THREAD_IN_PROC(p);
-#ifdef COMPAT_IA32
+#ifdef COMPAT_FREEBSD32
 	if (SV_CURPROC_FLAG(SV_ILP32)) {
 		if ((td2->td_proc->p_sysent->sv_flags & SV_ILP32) == 0) {
 			PROC_UNLOCK(p);

Modified: projects/ppc64/sys/fs/procfs/procfs_ioctl.c
==============================================================================
--- projects/ppc64/sys/fs/procfs/procfs_ioctl.c	Mon Mar  8 15:01:08 2010	(r204870)
+++ projects/ppc64/sys/fs/procfs/procfs_ioctl.c	Mon Mar  8 15:56:18 2010	(r204871)
@@ -42,7 +42,7 @@
 #include <fs/pseudofs/pseudofs.h>
 #include <fs/procfs/procfs.h>
 
-#ifdef COMPAT_IA32
+#ifdef COMPAT_FREEBSD32
 struct procfs_status32 {
 	int	state;	/* Running, stopped, something else? */
 	int	flags;	/* Any flags */
@@ -62,7 +62,7 @@ int
 procfs_ioctl(PFS_IOCTL_ARGS)
 {
 	struct procfs_status *ps;
-#ifdef COMPAT_IA32
+#ifdef COMPAT_FREEBSD32
 	struct procfs_status32 *ps32;
 #endif
 	int error, flags, sig;
@@ -142,7 +142,7 @@ procfs_ioctl(PFS_IOCTL_ARGS)
 		ps->why = p->p_step ? p->p_stype : 0;
 		ps->val = p->p_step ? p->p_xstat : 0;
 		break;
-#ifdef COMPAT_IA32
+#ifdef COMPAT_FREEBSD32
 	case PIOCWAIT32:
 		while (p->p_step == 0 && (p->p_flag & P_WEXIT) == 0) {
 			/* sleep until p stops */

Modified: projects/ppc64/sys/fs/procfs/procfs_map.c
==============================================================================
--- projects/ppc64/sys/fs/procfs/procfs_map.c	Mon Mar  8 15:01:08 2010	(r204870)
+++ projects/ppc64/sys/fs/procfs/procfs_map.c	Mon Mar  8 15:56:18 2010	(r204871)
@@ -47,7 +47,7 @@
 #include <sys/proc.h>
 #include <sys/resourcevar.h>
 #include <sys/sbuf.h>
-#ifdef COMPAT_IA32
+#ifdef COMPAT_FREEBSD32
 #include <sys/sysent.h>
 #endif
 #include <sys/uio.h>
@@ -86,7 +86,7 @@ procfs_doprocmap(PFS_FILL_ARGS)
 	struct uidinfo *uip;
 	int error, vfslocked;
 	unsigned int last_timestamp;
-#ifdef COMPAT_IA32
+#ifdef COMPAT_FREEBSD32
 	int wrap32 = 0;
 #endif
 
@@ -99,7 +99,7 @@ procfs_doprocmap(PFS_FILL_ARGS)
 	if (uio->uio_rw != UIO_READ)
 		return (EOPNOTSUPP);
 
-#ifdef COMPAT_IA32
+#ifdef COMPAT_FREEBSD32
         if (curproc->p_sysent->sv_flags & SV_ILP32) {
                 if (!(p->p_sysent->sv_flags & SV_ILP32))
                         return (EOPNOTSUPP);
@@ -209,7 +209,7 @@ procfs_doprocmap(PFS_FILL_ARGS)
 		    "0x%lx 0x%lx %d %d %p %s%s%s %d %d 0x%x %s %s %s %s %s %d\n",
 			(u_long)e_start, (u_long)e_end,
 			resident, privateresident,
-#ifdef COMPAT_IA32
+#ifdef COMPAT_FREEBSD32
 			wrap32 ? NULL : obj,	/* Hide 64 bit value */
 #else
 			obj,

Modified: projects/ppc64/sys/fs/procfs/procfs_regs.c
==============================================================================
--- projects/ppc64/sys/fs/procfs/procfs_regs.c	Mon Mar  8 15:01:08 2010	(r204870)
+++ projects/ppc64/sys/fs/procfs/procfs_regs.c	Mon Mar  8 15:56:18 2010	(r204871)
@@ -53,10 +53,13 @@
 #include <fs/pseudofs/pseudofs.h>
 #include <fs/procfs/procfs.h>
 
-#ifdef COMPAT_IA32
+#ifdef COMPAT_FREEBSD32
 #include <sys/procfs.h>
 #include <machine/fpu.h>
+
+#if defined(__amd64__) || defined(__ia64__)
 #include <compat/ia32/ia32_reg.h>
+#endif
 
 /*
  * PROC(write, regs, td2, &r) becomes
@@ -84,7 +87,7 @@ procfs_doprocregs(PFS_FILL_ARGS)
 	int error;
 	struct reg r;
 	struct thread *td2;
-#ifdef COMPAT_IA32
+#ifdef COMPAT_FREEBSD32
 	struct reg32 r32;
 	int wrap32 = 0;
 #endif
@@ -101,7 +104,7 @@ procfs_doprocregs(PFS_FILL_ARGS)
 
 	/* XXXKSE: */
 	td2 = FIRST_THREAD_IN_PROC(p);
-#ifdef COMPAT_IA32
+#ifdef COMPAT_FREEBSD32
 	if (SV_CURPROC_FLAG(SV_ILP32)) {
 		if ((td2->td_proc->p_sysent->sv_flags & SV_ILP32) == 0) {
 			PROC_UNLOCK(p);

Modified: projects/ppc64/sys/ia64/conf/NOTES
==============================================================================
--- projects/ppc64/sys/ia64/conf/NOTES	Mon Mar  8 15:01:08 2010	(r204870)
+++ projects/ppc64/sys/ia64/conf/NOTES	Mon Mar  8 15:56:18 2010	(r204871)
@@ -12,10 +12,9 @@
 cpu		ITANIUM
 cpu		ITANIUM2
 
-# options: COMPAT_IA32, COMPAT_FREEBSD32
-# These options enable the support for execution of i386 (32-bit) programs on
+# options: COMPAT_FREEBSD32
+# This option enables 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

Modified: projects/ppc64/sys/ia64/ia64/exception.S
==============================================================================
--- projects/ppc64/sys/ia64/ia64/exception.S	Mon Mar  8 15:01:08 2010	(r204870)
+++ projects/ppc64/sys/ia64/ia64/exception.S	Mon Mar  8 15:56:18 2010	(r204871)
@@ -676,7 +676,7 @@ ivt_##name:					\
 #define	IVT_END(name)				\
 	.endp	ivt_##name
 
-#ifdef COMPAT_IA32
+#ifdef COMPAT_FREEBSD32
 #define	IA32_TRAP	ia32_trap
 #else
 #define	IA32_TRAP	trap

Modified: projects/ppc64/sys/ia64/ia64/genassym.c
==============================================================================
--- projects/ppc64/sys/ia64/ia64/genassym.c	Mon Mar  8 15:01:08 2010	(r204870)
+++ projects/ppc64/sys/ia64/ia64/genassym.c	Mon Mar  8 15:56:18 2010	(r204871)
@@ -61,8 +61,8 @@
 #include <net/if.h>
 #include <netinet/in.h>
 
-#ifdef COMPAT_IA32
-ASSYM(COMPAT_IA32,	COMPAT_IA32);
+#ifdef COMPAT_FREEBSD32
+ASSYM(COMPAT_FREEBSD32,	COMPAT_FREEBSD32);
 #endif
 
 ASSYM(DT_NULL,		DT_NULL);

Modified: projects/ppc64/sys/ia64/ia64/machdep.c
==============================================================================
--- projects/ppc64/sys/ia64/ia64/machdep.c	Mon Mar  8 15:01:08 2010	(r204870)
+++ projects/ppc64/sys/ia64/ia64/machdep.c	Mon Mar  8 15:56:18 2010	(r204871)
@@ -443,7 +443,7 @@ cpu_switch(struct thread *old, struct th
 	struct pcb *oldpcb, *newpcb;
 
 	oldpcb = old->td_pcb;
-#ifdef COMPAT_IA32
+#ifdef COMPAT_FREEBSD32
 	ia32_savectx(oldpcb);
 #endif
 	if (PCPU_GET(fpcurthread) == old)
@@ -459,7 +459,7 @@ cpu_switch(struct thread *old, struct th
 		oldpcb->pcb_current_pmap =
 		    pmap_switch(newpcb->pcb_current_pmap);
 		PCPU_SET(curthread, new);
-#ifdef COMPAT_IA32
+#ifdef COMPAT_FREEBSD32
 		ia32_restorectx(newpcb);
 #endif
 		if (PCPU_GET(fpcurthread) == new)
@@ -479,7 +479,7 @@ cpu_throw(struct thread *old __unused, s
 	newpcb = new->td_pcb;
 	(void)pmap_switch(newpcb->pcb_current_pmap);
 	PCPU_SET(curthread, new);
-#ifdef COMPAT_IA32
+#ifdef COMPAT_FREEBSD32
 	ia32_restorectx(newpcb);
 #endif
 	restorectx(newpcb);

Modified: projects/ppc64/sys/kern/imgact_elf.c
==============================================================================
--- projects/ppc64/sys/kern/imgact_elf.c	Mon Mar  8 15:01:08 2010	(r204870)
+++ projects/ppc64/sys/kern/imgact_elf.c	Mon Mar  8 15:56:18 2010	(r204871)
@@ -70,7 +70,7 @@ __FBSDID("$FreeBSD$");
 #include <machine/elf.h>
 #include <machine/md_var.h>
 
-#if defined(COMPAT_IA32) && __ELF_WORD_SIZE == 32
+#if (defined(__amd64__) || defined(__ia64__)) && __ELF_WORD_SIZE == 32
 #include <machine/fpu.h>
 #include <compat/ia32/ia32_reg.h>
 #endif

Modified: projects/ppc64/sys/kern/kern_jail.c
==============================================================================
--- projects/ppc64/sys/kern/kern_jail.c	Mon Mar  8 15:01:08 2010	(r204870)
+++ projects/ppc64/sys/kern/kern_jail.c	Mon Mar  8 15:56:18 2010	(r204871)
@@ -735,7 +735,7 @@ kern_jail_set(struct thread *td, struct 
 	}
 
 #ifdef COMPAT_FREEBSD32
-	if (td->td_proc->p_sysent->sv_flags & SV_IA32) {
+	if (td->td_proc->p_sysent->sv_flags & SV_ILP32) {
 		uint32_t hid32;
 
 		error = vfs_copyopt(opts, "host.hostid", &hid32, sizeof(hid32));
@@ -1962,7 +1962,7 @@ kern_jail_get(struct thread *td, struct 
 	if (error != 0 && error != ENOENT)
 		goto done_deref;
 #ifdef COMPAT_FREEBSD32
-	if (td->td_proc->p_sysent->sv_flags & SV_IA32) {
+	if (td->td_proc->p_sysent->sv_flags & SV_ILP32) {
 		uint32_t hid32 = pr->pr_hostid;
 
 		error = vfs_setopt(opts, "host.hostid", &hid32, sizeof(hid32));

Modified: projects/ppc64/sys/kern/sys_process.c
==============================================================================
--- projects/ppc64/sys/kern/sys_process.c	Mon Mar  8 15:01:08 2010	(r204870)
+++ projects/ppc64/sys/kern/sys_process.c	Mon Mar  8 15:56:18 2010	(r204871)
@@ -65,7 +65,7 @@ __FBSDID("$FreeBSD$");
 #ifdef COMPAT_FREEBSD32
 #include <sys/procfs.h>
 
-#ifdef COMPAT_IA32
+#if defined(__ia64__) || defined(__amd64__)
 #include <machine/fpu.h>
 #include <compat/ia32/ia32_reg.h>
 #endif
@@ -476,7 +476,7 @@ ptrace_vm_entry(struct thread *td, struc
 	return (error);
 }
 
-#ifdef COMPAT_IA32
+#ifdef COMPAT_FREEBSD32
 static int      
 ptrace_vm_entry32(struct thread *td, struct proc *p,
     struct ptrace_vm_entry32 *pve32)
@@ -503,7 +503,7 @@ ptrace_vm_entry32(struct thread *td, str
 	pve32->pve_pathlen = pve.pve_pathlen;
 	return (error);
 }
-#endif /* COMPAT_IA32 */
+#endif /* COMPAT_FREEBSD32 */
 
 /*
  * Process debugging system call.
@@ -1150,7 +1150,7 @@ kern_ptrace(struct thread *td, int req, 
 
 	case PT_VM_ENTRY:
 		PROC_UNLOCK(p);
-#ifdef COMPAT_IA32
+#ifdef COMPAT_FREEBSD32
 		if (wrap32)
 			error = ptrace_vm_entry32(td, p, addr);
 		else

Modified: projects/ppc64/sys/modules/linux/Makefile
==============================================================================
--- projects/ppc64/sys/modules/linux/Makefile	Mon Mar  8 15:01:08 2010	(r204870)
+++ projects/ppc64/sys/modules/linux/Makefile	Mon Mar  8 15:56:18 2010	(r204871)
@@ -2,7 +2,7 @@
 
 .if ${MACHINE_ARCH} == "amd64"
 SFX= 32
-CFLAGS+=-DCOMPAT_IA32 -DCOMPAT_LINUX32
+CFLAGS+=-DCOMPAT_FREEBSD32 -DCOMPAT_LINUX32
 .endif
 
 .PATH: ${.CURDIR}/../../compat/linux ${.CURDIR}/../../${MACHINE_ARCH}/linux${SFX}

Modified: projects/ppc64/sys/modules/procfs/Makefile
==============================================================================
--- projects/ppc64/sys/modules/procfs/Makefile	Mon Mar  8 15:01:08 2010	(r204870)
+++ projects/ppc64/sys/modules/procfs/Makefile	Mon Mar  8 15:56:18 2010	(r204871)
@@ -35,7 +35,7 @@ opt_compat.h:
 	echo "#define COMPAT_FREEBSD5 1" >> ${.TARGET}
 	echo "#define COMPAT_FREEBSD6 1" >> ${.TARGET}
 .if ${MACHINE_ARCH} == "amd64"
-	echo "#define COMPAT_IA32 1" >> ${.TARGET}
+	echo "#define COMPAT_FREEBSD32 1" >> ${.TARGET}
 	echo "#define COMPAT_LINUX32 1" >> ${.TARGET}
 .endif
 .endif

Modified: projects/ppc64/sys/powerpc/include/elf.h
==============================================================================
--- projects/ppc64/sys/powerpc/include/elf.h	Mon Mar  8 15:01:08 2010	(r204870)
+++ projects/ppc64/sys/powerpc/include/elf.h	Mon Mar  8 15:56:18 2010	(r204871)
@@ -137,7 +137,7 @@ __ElfType(Auxinfo);
 #include "opt_compat.h"
 #endif
 
-#ifdef COMPAT_PPC32
+#ifdef COMPAT_FREEBSD32
 /*
  * Alternative layouts for <sys/procfs.h>
  * Used in core dumps, the reason for this file existing.

Modified: projects/ppc64/sys/powerpc/include/reg.h
==============================================================================
--- projects/ppc64/sys/powerpc/include/reg.h	Mon Mar  8 15:01:08 2010	(r204870)
+++ projects/ppc64/sys/powerpc/include/reg.h	Mon Mar  8 15:56:18 2010	(r204871)
@@ -28,7 +28,7 @@ struct dbreg {
 	unsigned int	junk;
 };
 
-#ifdef COMPAT_PPC32
+#ifdef COMPAT_FREEBSD32
 /* Must match struct trapframe */
 struct reg32 {
 	int32_t fixreg[32];
@@ -59,7 +59,7 @@ int	set_fpregs(struct thread *, struct f
 int	fill_dbregs(struct thread *, struct dbreg *);
 int	set_dbregs(struct thread *, struct dbreg *);
 
-#ifdef COMPAT_PPC32
+#ifdef COMPAT_FREEBSD32
 struct image_params;
 
 int	fill_regs32(struct thread *, struct reg32 *);

Modified: projects/ppc64/sys/powerpc/powerpc/exec_machdep.c
==============================================================================
--- projects/ppc64/sys/powerpc/powerpc/exec_machdep.c	Mon Mar  8 15:01:08 2010	(r204870)
+++ projects/ppc64/sys/powerpc/powerpc/exec_machdep.c	Mon Mar  8 15:56:18 2010	(r204871)
@@ -555,7 +555,7 @@ exec_setregs(struct thread *td, u_long e
 	td->td_pcb->pcb_flags = 0;
 }
 
-#ifdef COMPAT_PPC32
+#ifdef COMPAT_FREEBSD32
 void
 ppc32_setregs(struct thread *td, u_long entry, u_long stack, u_long ps_strings,
     struct image_params *imgp)
@@ -649,7 +649,7 @@ set_fpregs(struct thread *td, struct fpr
 	return (0);
 }
 
-#ifdef COMPAT_PPC32
+#ifdef COMPAT_FREEBSD32
 int
 set_regs32(struct thread *td, struct reg32 *regs)
 {

Modified: projects/ppc64/sys/powerpc64/conf/GENERIC
==============================================================================
--- projects/ppc64/sys/powerpc64/conf/GENERIC	Mon Mar  8 15:01:08 2010	(r204870)
+++ projects/ppc64/sys/powerpc64/conf/GENERIC	Mon Mar  8 15:56:18 2010	(r204871)
@@ -52,8 +52,7 @@ options 	PSEUDOFS		#Pseudo-filesystem fr
 options 	GEOM_PART_GPT		#GUID Partition Tables.
 options 	GEOM_LABEL		#Provides labelization
 options 	COMPAT_43TTY		#BSD 4.3 TTY compat (sgtty)
-options 	COMPAT_PPC32		#Compatible with PPC32 binaries
-options 	COMPAT_FREEBSD32
+options 	COMPAT_FREEBSD32	#Compatible with PPC32 binaries
 options 	COMPAT_FREEBSD5		#Compatible with FreeBSD5
 options 	COMPAT_FREEBSD6		#Compatible with FreeBSD6
 options 	COMPAT_FREEBSD7		#Compatible with FreeBSD7

More information about the svn-src-projects mailing list