--- a/usr/src/Makefile.lint	Fri Jun 11 14:34:29 2010 -0400
+++ b/usr/src/Makefile.lint	Fri Jun 11 12:07:14 2010 -0700
@@ -480,7 +480,6 @@
 	cmd/biosdev \
 	cmd/rtc \
 	cmd/ucodeadm \
-	lib/brand/lx \
 	lib/cfgadm_plugins/sata \
 	lib/cfgadm_plugins/sbd \
 	lib/libfdisk

--- a/usr/src/Targetdirs	Fri Jun 11 14:34:29 2010 -0400
+++ b/usr/src/Targetdirs	Fri Jun 11 12:07:14 2010 -0700
@@ -45,9 +45,6 @@
 	/boot/grub \
 	/boot/grub/bin \
 	/platform/i86pc \
-	/usr/lib/brand/lx \
-	/usr/lib/brand/lx/amd64 \
-	/usr/lib/brand/lx/distros \
 	/usr/lib/xen \
 	/usr/lib/xen/bin
 
@@ -513,9 +510,6 @@
 	/usr/ucblib/32 \
 	/var/ld/32
 
-i386_SYM.DIRS64= \
-	/usr/lib/brand/lx/64
-
 sparc_SYM.DIRS64=
 
 SYM.DIRS64= \
@@ -632,7 +626,6 @@
 $(BUILD64) $(ROOT)/lib/secure/64:=	LINKDEST=$(MACH64)
 $(BUILD64) $(ROOT)/usr/lib/64:=		LINKDEST=$(MACH64)
 $(BUILD64) $(ROOT)/usr/lib/elfedit/64:=	LINKDEST=$(MACH64)
-$(BUILD64) $(ROOT)/usr/lib/brand/lx/64:=	LINKDEST=$(MACH64)
 $(BUILD64) $(ROOT)/usr/lib/brand/sn1/64:=	LINKDEST=$(MACH64)
 $(BUILD64) $(ROOT)/usr/lib/brand/solaris10/64:=	LINKDEST=$(MACH64)
 $(BUILD64) $(ROOT)/usr/lib/libp/64:=	LINKDEST=$(MACH64)

--- a/usr/src/cmd/devfsadm/i386/Makefile	Fri Jun 11 14:34:29 2010 -0400
+++ b/usr/src/cmd/devfsadm/i386/Makefile	Fri Jun 11 12:07:14 2010 -0700
@@ -19,18 +19,13 @@
 # CDDL HEADER END
 #
 #
-# Copyright 2007 Sun Microsystems, Inc.  All rights reserved.
-# Use is subject to license terms.
+# Copyright (c) 1998, 2010, Oracle and/or its affiliates. All rights reserved.
 #
-#ident	"%Z%%M%	%I%	%E% SMI"
 
 LINK_OBJS_i386 = \
 	misc_link_i386.o \
-	lx_link_i386.o \
 	xen_link.o
 
-lx_link_i386.o lx_link_i386.po lx_link_i386.ln := CPPFLAGS += -I$(UTSBASE)/common/brand/lx
-
 xen_link.o xen_link.ln xen_link.po := CPPFLAGS += -I$(UTSBASE)/i86xpv
 
 include ../Makefile.com

--- a/usr/src/cmd/devfsadm/i386/lx_link_i386.c	Fri Jun 11 14:34:29 2010 -0400
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,86 +0,0 @@
-/*
- * CDDL HEADER START
- *
- * The contents of this file are subject to the terms of the
- * Common Development and Distribution License (the "License").
- * You may not use this file except in compliance with the License.
- *
- * You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
- * or http://www.opensolaris.org/os/licensing.
- * See the License for the specific language governing permissions
- * and limitations under the License.
- *
- * When distributing Covered Code, include this CDDL HEADER in each
- * file and include the License file at usr/src/OPENSOLARIS.LICENSE.
- * If applicable, add the following below this CDDL HEADER, with the
- * fields enclosed by brackets "[]" replaced with your own identifying
- * information: Portions Copyright [yyyy] [name of copyright owner]
- *
- * CDDL HEADER END
- */
-
-/*
- * Copyright 2006 Sun Microsystems, Inc.  All rights reserved.
- * Use is subject to license terms.
- */
-
-#pragma ident	"%Z%%M%	%I%	%E% SMI"
-
-#include <devfsadm.h>
-#include <strings.h>
-#include <stdio.h>
-#include <sys/lx_ptm.h>
-#include <sys/lx_audio.h>
-
-static int lx_ptm(di_minor_t minor, di_node_t node);
-static int lx_audio(di_minor_t minor, di_node_t node);
-static int lx_systrace(di_minor_t minor, di_node_t node);
-
-static devfsadm_create_t lx_create_cbt[] = {
-	{ "pseudo", "ddi_pseudo", LX_PTM_DRV,
-	    TYPE_EXACT | DRV_EXACT, ILEVEL_0, lx_ptm },
-	{ "pseudo", "ddi_pseudo", LX_AUDIO_DRV,
-	    TYPE_EXACT | DRV_EXACT, ILEVEL_0, lx_audio },
-	{ "pseudo", "ddi_pseudo", "lx_systrace",
-	    TYPE_EXACT | DRV_EXACT, ILEVEL_0, lx_systrace },
-};
-
-DEVFSADM_CREATE_INIT_V0(lx_create_cbt);
-
-static int
-lx_ptm(di_minor_t minor, di_node_t node)
-{
-	char *mname = di_minor_name(minor);
-
-	if (strcmp(LX_PTM_MINOR_NODE, mname) == 0)
-		(void) devfsadm_mklink("brand/lx/ptmx", node, minor, 0);
-
-	return (DEVFSADM_CONTINUE);
-}
-
-static int
-lx_audio(di_minor_t minor, di_node_t node)
-{
-	char *mname = di_minor_name(minor);
-
-	if (strcmp(LXA_MINORNAME_DEVCTL, mname) == 0)
-		(void) devfsadm_mklink("brand/lx/audio_devctl", node, minor, 0);
-	if (strcmp(LXA_MINORNAME_DSP, mname) == 0)
-		(void) devfsadm_mklink("brand/lx/dsp", node, minor, 0);
-	if (strcmp(LXA_MINORNAME_MIXER, mname) == 0)
-		(void) devfsadm_mklink("brand/lx/mixer", node, minor, 0);
-
-	return (DEVFSADM_CONTINUE);
-}
-
-static int
-lx_systrace(di_minor_t minor, di_node_t node)
-{
-	char *mname = di_minor_name(minor);
-	char path[MAXPATHLEN];
-
-	(void) snprintf(path, sizeof (path), "dtrace/provider/%s", mname);
-	(void) devfsadm_mklink(path, node, minor, 0);
-
-	return (DEVFSADM_CONTINUE);
-}

--- a/usr/src/cmd/truss/codes.c	Fri Jun 11 14:34:29 2010 -0400
+++ b/usr/src/cmd/truss/codes.c	Fri Jun 11 12:07:14 2010 -0700
@@ -382,9 +382,6 @@
 	{ (uint_t)TIOCSILOOP,	"TIOCSILOOP",	NULL },
 	{ (uint_t)TIOCCILOOP,	"TIOCSILOOP",	NULL },
 
-	{ (uint_t)TIOCSETLD,	"TIOCSETLD",	NULL },
-	{ (uint_t)TIOCGETLD,	"TIOCGETLD",	NULL },
-
 	{ (uint_t)TIOCGPPS,	"TIOCGPPS",	NULL },
 	{ (uint_t)TIOCSPPS,	"TIOCSPPS",	NULL },
 	{ (uint_t)TIOCGPPSEV,	"TIOCGPPSEV",	NULL },

--- a/usr/src/cmd/zlogin/zlogin.c	Fri Jun 11 14:34:29 2010 -0400
+++ b/usr/src/cmd/zlogin/zlogin.c	Fri Jun 11 12:07:14 2010 -0700
@@ -2181,18 +2181,8 @@
 		/*
 		 * In failsafe mode, we don't use login(1), so don't try
 		 * setting up a utmpx entry.
-		 *
-		 * A branded zone may have very different utmpx semantics.
-		 * At the moment, we only have two brand types:
-		 * Solaris-like (native, sn1) and Linux.  In the Solaris
-		 * case, we know exactly how to do the necessary utmpx
-		 * setup.  Fortunately for us, the Linux /bin/login is
-		 * prepared to deal with a non-initialized utmpx entry, so
-		 * we can simply skip it.  If future brands don't fall into
-		 * either category, we'll have to add a per-brand utmpx
-		 * setup hook.
 		 */
-		if (!failsafe && (strcmp(zonebrand, "lx") != 0))
+		if (!failsafe)
 			if (setup_utmpx(slaveshortname) == -1)
 				return (1);
 

--- a/usr/src/cmd/zoneadm/svc-zones	Fri Jun 11 14:34:29 2010 -0400
+++ b/usr/src/cmd/zoneadm/svc-zones	Fri Jun 11 12:07:14 2010 -0700
@@ -20,8 +20,7 @@
 # CDDL HEADER END
 #
 #
-# Copyright 2009 Sun Microsystems, Inc.  All rights reserved.
-# Use is subject to license terms.
+# Copyright (c) 2004, 2010, Oracle and/or its affiliates. All rights reserved.
 
 . /lib/svc/share/smf_include.sh
 
@@ -29,12 +28,10 @@
 # Return a list of running, non-global zones for which a shutdown via
 # "/sbin/init 0" may work (typically only Solaris zones.)
 #
-# At present, this means any running "lx" zones don't qualify.
-#
 shutdown_zones()
 {
 	zoneadm list -p | nawk -F: '{
-		if (($5 != "lx") && ($2 != "global")) {
+		if ($2 != "global") {
 			print $2
 		}
 	}'

--- a/usr/src/common/brand/lx/lx_signum.c	Fri Jun 11 14:34:29 2010 -0400
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,242 +0,0 @@
-/*
- * CDDL HEADER START
- *
- * The contents of this file are subject to the terms of the
- * Common Development and Distribution License (the "License").
- * You may not use this file except in compliance with the License.
- *
- * You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
- * or http://www.opensolaris.org/os/licensing.
- * See the License for the specific language governing permissions
- * and limitations under the License.
- *
- * When distributing Covered Code, include this CDDL HEADER in each
- * file and include the License file at usr/src/OPENSOLARIS.LICENSE.
- * If applicable, add the following below this CDDL HEADER, with the
- * fields enclosed by brackets "[]" replaced with your own identifying
- * information: Portions Copyright [yyyy] [name of copyright owner]
- *
- * CDDL HEADER END
- */
-
-/*
- * Copyright 2010 Sun Microsystems, Inc.  All rights reserved.
- * Use is subject to license terms.
- */
-
-#include <sys/signal.h>
-#include <lx_signum.h>
-
-/*
- * Delivering signals to a Linux process is complicated by differences in
- * signal numbering, stack structure and contents, and the action taken when a
- * signal handler exits.  In addition, many signal-related structures, such as
- * sigset_ts, vary between Solaris and Linux.
- *
- * The simplest transformation that must be done when sending signals is to
- * translate between Linux and Solaris signal numbers.
- *
- * These are the major signal number differences between Linux and Solaris:
- *
- * 	====================================
- * 	| Number |   Linux    |  Solaris   |
- * 	| ====== | =========  | ========== |
- *	|    7   | SIGBUS     | SIGEMT     |
- *	|   10   | SIGUSR1    | SIGBUS     |
- *	|   12   | SIGUSR2    | SIGSYS     |
- *	|   16   | SIGSTKFLT  | SIGUSR1    |
- *	|   17   | SIGCHLD    | SIGUSR2    |
- * 	|   18   | SIGCONT    | SIGCHLD    |
- *	|   19   | SIGSTOP    | SIGPWR     |
- * 	|   20   | SIGTSTP    | SIGWINCH   |
- * 	|   21   | SIGTTIN    | SIGURG     |
- * 	|   22   | SIGTTOU    | SIGPOLL    |
- *	|   23   | SIGURG     | SIGSTOP    |
- * 	|   24   | SIGXCPU    | SIGTSTP    |
- *	|   25   | SIGXFSZ    | SIGCONT    |
- *	|   26   | SIGVTALARM | SIGTTIN    |
- *	|   27   | SIGPROF    | SIGTTOU    |
- *	|   28   | SIGWINCH   | SIGVTALARM |
- *	|   29   | SIGPOLL    | SIGPROF    |
- *	|   30   | SIGPWR     | SIGXCPU    |
- *	|   31   | SIGSYS     | SIGXFSZ    |
- * 	====================================
- *
- * Not every Linux signal maps to a Solaris signal, nor does every Solaris
- * signal map to a Linux counterpart. However, when signals do map, the
- * mapping is unique.
- *
- * One mapping issue is that Linux supports 33 real time signals, with SIGRTMIN
- * typically starting at or near 32 (SIGRTMIN) and proceeding to 64 (SIGRTMAX)
- * (SIGRTMIN is "at or near" 32 because glibc usually "steals" one ore more of
- * these signals for its own internal use, adjusting SIGRTMIN and SIGRTMAX as
- * needed.)  Conversely, Solaris actively uses signals 32-40 for other purposes
- * and supports exactly 32 real time signals, in the range 41 (SIGRTMIN)
- * to 72 (SIGRTMAX).
- *
- * At present, attempting to translate a Linux signal equal to 63
- * will generate an error (we allow SIGRTMAX because a program
- * should be able to send SIGRTMAX without getting an EINVAL, though obviously
- * anything that loops through the signals from SIGRTMIN to SIGRTMAX will
- * fail.)
- *
- * Similarly, attempting to translate a native Solaris signal in the range
- * 32-40 will also generate an error as we don't want to support the receipt of
- * those signals from the Solaris global zone.
- */
-
-/*
- * Linux to Solaris signal map
- *
- * Usage:  solaris_signal = ltos_signum[lx_signal];
- */
-const int
-ltos_signo[LX_NSIG] = {
-	0,
-	SIGHUP,
-	SIGINT,
-	SIGQUIT,
-	SIGILL,
-	SIGTRAP,
-	SIGABRT,
-	SIGBUS,
-	SIGFPE,
-	SIGKILL,
-	SIGUSR1,
-	SIGSEGV,
-	SIGUSR2,
-	SIGPIPE,
-	SIGALRM,
-	SIGTERM,
-	SIGEMT,			/* 16:  Linux SIGSTKFLT; use Solaris SIGEMT */
-	SIGCHLD,
-	SIGCONT,
-	SIGSTOP,
-	SIGTSTP,
-	SIGTTIN,
-	SIGTTOU,
-	SIGURG,
-	SIGXCPU,
-	SIGXFSZ,
-	SIGVTALRM,
-	SIGPROF,
-	SIGWINCH,
-	SIGPOLL,
-	SIGPWR,
-	SIGSYS,
-	_SIGRTMIN,		/* 32:  Linux SIGRTMIN */
-	_SIGRTMIN + 1,
-	_SIGRTMIN + 2,
-	_SIGRTMIN + 3,
-	_SIGRTMIN + 4,
-	_SIGRTMIN + 5,
-	_SIGRTMIN + 6,
-	_SIGRTMIN + 7,
-	_SIGRTMIN + 8,
-	_SIGRTMIN + 9,
-	_SIGRTMIN + 10,
-	_SIGRTMIN + 11,
-	_SIGRTMIN + 12,
-	_SIGRTMIN + 13,
-	_SIGRTMIN + 14,
-	_SIGRTMIN + 15,
-	_SIGRTMIN + 16,
-	_SIGRTMIN + 17,
-	_SIGRTMIN + 18,
-	_SIGRTMIN + 19,
-	_SIGRTMIN + 20,
-	_SIGRTMIN + 21,
-	_SIGRTMIN + 22,
-	_SIGRTMIN + 23,
-	_SIGRTMIN + 24,
-	_SIGRTMIN + 25,
-	_SIGRTMIN + 26,
-	_SIGRTMIN + 27,
-	_SIGRTMIN + 28,
-	_SIGRTMIN + 29,
-	_SIGRTMIN + 30,
-	-1,			/* 63:  Linux SIGRTMIN + 31, or SIGRTMAX - 1 */
-	_SIGRTMAX,		/* 64:  Linux SIGRTMAX */
-};
-
-/*
- * Solaris to Linux signal map
- *
- * Usage:  lx_signal = stol_signo[solaris_signal];
- */
-const int
-stol_signo[NSIG] = {
-	0,
-	LX_SIGHUP,
-	LX_SIGINT,
-	LX_SIGQUIT,
-	LX_SIGILL,
-	LX_SIGTRAP,
-	LX_SIGABRT,
-	LX_SIGSTKFLT,		/* 7:  Solaris SIGEMT; use for LX_SIGSTKFLT */
-	LX_SIGFPE,
-	LX_SIGKILL,
-	LX_SIGBUS,
-	LX_SIGSEGV,
-	LX_SIGSYS,
-	LX_SIGPIPE,
-	LX_SIGALRM,
-	LX_SIGTERM,
-	LX_SIGUSR1,
-	LX_SIGUSR2,
-	LX_SIGCHLD,
-	LX_SIGPWR,
-	LX_SIGWINCH,
-	LX_SIGURG,
-	LX_SIGPOLL,
-	LX_SIGSTOP,
-	LX_SIGTSTP,
-	LX_SIGCONT,
-	LX_SIGTTIN,
-	LX_SIGTTOU,
-	LX_SIGVTALRM,
-	LX_SIGPROF,
-	LX_SIGXCPU,
-	LX_SIGXFSZ,
-	-1,			/* 32:  Solaris SIGWAITING */
-	-1,			/* 33:  Solaris SIGLWP */
-	-1,			/* 34:  Solaris SIGFREEZE */
-	-1,			/* 35:  Solaris SIGTHAW */
-	-1,			/* 36:  Solaris SIGCANCEL */
-	-1,			/* 37:  Solaris SIGLOST */
-	-1,			/* 38:  Solaris SIGXRES */
-	-1,			/* 39:  Solaris SIGJVM1 */
-	-1,			/* 40:  Solaris SIGJVM2 */
-	LX_SIGRTMIN,		/* 41:  Solaris _SIGRTMIN */
-	LX_SIGRTMIN + 1,
-	LX_SIGRTMIN + 2,
-	LX_SIGRTMIN + 3,
-	LX_SIGRTMIN + 4,
-	LX_SIGRTMIN + 5,
-	LX_SIGRTMIN + 6,
-	LX_SIGRTMIN + 7,
-	LX_SIGRTMIN + 8,
-	LX_SIGRTMIN + 9,
-	LX_SIGRTMIN + 10,
-	LX_SIGRTMIN + 11,
-	LX_SIGRTMIN + 12,
-	LX_SIGRTMIN + 13,
-	LX_SIGRTMIN + 14,
-	LX_SIGRTMIN + 15,
-	LX_SIGRTMIN + 16,
-	LX_SIGRTMIN + 17,
-	LX_SIGRTMIN + 18,
-	LX_SIGRTMIN + 19,
-	LX_SIGRTMIN + 20,
-	LX_SIGRTMIN + 21,
-	LX_SIGRTMIN + 22,
-	LX_SIGRTMIN + 23,
-	LX_SIGRTMIN + 24,
-	LX_SIGRTMIN + 25,
-	LX_SIGRTMIN + 26,
-	LX_SIGRTMIN + 27,
-	LX_SIGRTMIN + 28,
-	LX_SIGRTMIN + 29,
-	LX_SIGRTMIN + 30,
-	LX_SIGRTMAX,		/* 72: Solaris _SIGRTMAX */
-};

--- a/usr/src/common/brand/lx/lx_signum.h	Fri Jun 11 14:34:29 2010 -0400
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,84 +0,0 @@
-/*
- * CDDL HEADER START
- *
- * The contents of this file are subject to the terms of the
- * Common Development and Distribution License (the "License").
- * You may not use this file except in compliance with the License.
- *
- * You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
- * or http://www.opensolaris.org/os/licensing.
- * See the License for the specific language governing permissions
- * and limitations under the License.
- *
- * When distributing Covered Code, include this CDDL HEADER in each
- * file and include the License file at usr/src/OPENSOLARIS.LICENSE.
- * If applicable, add the following below this CDDL HEADER, with the
- * fields enclosed by brackets "[]" replaced with your own identifying
- * information: Portions Copyright [yyyy] [name of copyright owner]
- *
- * CDDL HEADER END
- */
-/*
- * Copyright 2006 Sun Microsystems, Inc.  All rights reserved.
- * Use is subject to license terms.
- */
-
-#ifndef _LX_SIGNUM_H
-#define	_LX_SIGNUM_H
-
-#pragma ident	"%Z%%M%	%I%	%E% SMI"
-
-#ifdef	__cplusplus
-extern "C" {
-#endif
-
-#define	LX_SIGHUP	1
-#define	LX_SIGINT	2
-#define	LX_SIGQUIT	3
-#define	LX_SIGILL	4
-#define	LX_SIGTRAP	5
-#define	LX_SIGABRT	6
-#define	LX_SIGIOT	6
-#define	LX_SIGBUS	7
-#define	LX_SIGFPE	8
-#define	LX_SIGKILL	9
-#define	LX_SIGUSR1	10
-#define	LX_SIGSEGV	11
-#define	LX_SIGUSR2	12
-#define	LX_SIGPIPE	13
-#define	LX_SIGALRM	14
-#define	LX_SIGTERM	15
-#define	LX_SIGSTKFLT	16
-#define	LX_SIGCHLD	17
-#define	LX_SIGCONT	18
-#define	LX_SIGSTOP	19
-#define	LX_SIGTSTP	20
-#define	LX_SIGTTIN	21
-#define	LX_SIGTTOU	22
-#define	LX_SIGURG	23
-#define	LX_SIGXCPU	24
-#define	LX_SIGXFSZ	25
-#define	LX_SIGVTALRM	26
-#define	LX_SIGPROF	27
-#define	LX_SIGWINCH	28
-#define	LX_SIGIO	29
-#define	LX_SIGPOLL	LX_SIGIO
-#define	LX_SIGPWR	30
-#define	LX_SIGSYS	31
-#define	LX_SIGUNUSED	31
-
-#define	LX_NSIG_WORDS	2
-#define	LX_NBPW		32
-#define	LX_NSIG		((LX_NBPW * LX_NSIG_WORDS) + 1)
-
-#define	LX_SIGRTMIN	32
-#define	LX_SIGRTMAX	LX_NSIG - 1
-
-extern const int ltos_signo[];
-extern const int stol_signo[];
-
-#ifdef	__cplusplus
-}
-#endif
-
-#endif	/* _LX_SIGNUM_H */

--- a/usr/src/lib/brand/Makefile	Fri Jun 11 14:34:29 2010 -0400
+++ b/usr/src/lib/brand/Makefile	Fri Jun 11 12:07:14 2010 -0700
@@ -30,9 +30,6 @@
 # Build everything in parallel; use .WAIT for dependencies
 .PARALLEL:
 
-i386_SUBDIRS= lx
-i386_MSGSUBDIRS= lx
-
 SUBDIRS= shared .WAIT sn1 solaris10 ipkg labeled $($(MACH)_SUBDIRS)
 MSGSUBDIRS= solaris10 shared $($(MACH)_MSGSUBDIRS)
 

--- a/usr/src/lib/brand/lx/Makefile	Fri Jun 11 14:34:29 2010 -0400
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,56 +0,0 @@
-#
-# CDDL HEADER START
-#
-# The contents of this file are subject to the terms of the
-# Common Development and Distribution License (the "License").
-# You may not use this file except in compliance with the License.
-#
-# You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
-# or http://www.opensolaris.org/os/licensing.
-# See the License for the specific language governing permissions
-# and limitations under the License.
-#
-# When distributing Covered Code, include this CDDL HEADER in each
-# file and include the License file at usr/src/OPENSOLARIS.LICENSE.
-# If applicable, add the following below this CDDL HEADER, with the
-# fields enclosed by brackets "[]" replaced with your own identifying
-# information: Portions Copyright [yyyy] [name of copyright owner]
-#
-# CDDL HEADER END
-#
-
-#
-# Copyright 2006 Sun Microsystems, Inc.  All rights reserved.
-# Use is subject to license terms.
-#
-# ident	"%Z%%M%	%I%	%E% SMI"
-#
-
-default: all
-
-include Makefile.lx
-
-# Build everything in parallel; use .WAIT for dependencies
-.PARALLEL:
-
-SUBDIRS=	cmd librtld_db lx_support lx_brand lx_thunk netfiles zone \
-		.WAIT lx_nametoaddr
-MSGSUBDIRS=	lx_brand lx_support zone
-
-all :=		TARGET= all
-install :=	TARGET= install
-clean :=	TARGET= clean
-clobber :=	TARGET= clobber
-lint :=		TARGET= lint
-_msg :=		TARGET= _msg
-
-.KEEP_STATE:
-
-all install clean clobber lint: $(SUBDIRS)
-
-_msg: $(MSGSUBDIRS)
-
-$(SUBDIRS): FRC
-	@cd $@; pwd; $(MAKE) $(TARGET)
-
-FRC:

--- a/usr/src/lib/brand/lx/Makefile.lx	Fri Jun 11 14:34:29 2010 -0400
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,34 +0,0 @@
-#
-# CDDL HEADER START
-#
-# The contents of this file are subject to the terms of the
-# Common Development and Distribution License (the "License").
-# You may not use this file except in compliance with the License.
-#
-# You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
-# or http://www.opensolaris.org/os/licensing.
-# See the License for the specific language governing permissions
-# and limitations under the License.
-#
-# When distributing Covered Code, include this CDDL HEADER in each
-# file and include the License file at usr/src/OPENSOLARIS.LICENSE.
-# If applicable, add the following below this CDDL HEADER, with the
-# fields enclosed by brackets "[]" replaced with your own identifying
-# information: Portions Copyright [yyyy] [name of copyright owner]
-#
-# CDDL HEADER END
-#
-#
-# Copyright 2006 Sun Microsystems, Inc.  All rights reserved.
-# Use is subject to license terms.
-#
-# ident	"%Z%%M%	%I%	%E% SMI"
-#
-# lib/brand/lx/Makefile.lx
-#
-# include global definitions
-
-BRAND=	lx
-
-include $(SRC)/lib/brand/Makefile.brand
-

--- a/usr/src/lib/brand/lx/cmd/Makefile	Fri Jun 11 14:34:29 2010 -0400
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,48 +0,0 @@
-#
-# CDDL HEADER START
-#
-# The contents of this file are subject to the terms of the
-# Common Development and Distribution License (the "License").
-# You may not use this file except in compliance with the License.
-#
-# You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
-# or http://www.opensolaris.org/os/licensing.
-# See the License for the specific language governing permissions
-# and limitations under the License.
-#
-# When distributing Covered Code, include this CDDL HEADER in each
-# file and include the License file at usr/src/OPENSOLARIS.LICENSE.
-# If applicable, add the following below this CDDL HEADER, with the
-# fields enclosed by brackets "[]" replaced with your own identifying
-# information: Portions Copyright [yyyy] [name of copyright owner]
-#
-# CDDL HEADER END
-#
-
-#
-# Copyright 2006 Sun Microsystems, Inc.  All rights reserved.
-# Use is subject to license terms.
-#
-#ident	"%Z%%M%	%I%	%E% SMI"
-
-PROGS =		lx_lockd lx_native lx_statd lx_thunk
-
-include ../Makefile.lx
-
-# override the install directory
-ROOTBIN =	$(ROOTBRANDDIR)
-CLOBBERFILES =	$(ROOTPROGS)
-
-.KEEP_STATE:
-
-lint:
-
-all:		$(PROGS)
-
-install:	all $(ROOTPROGS)
-
-clean:
-	$(RM) $(PROGS)
-
-clobber: clean
-	$(RM) $(ROOTPROGS)

--- a/usr/src/lib/brand/lx/cmd/lx_lockd.sh	Fri Jun 11 14:34:29 2010 -0400
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,36 +0,0 @@
-#!/bin/sh
-#
-# CDDL HEADER START
-#
-# The contents of this file are subject to the terms of the
-# Common Development and Distribution License (the "License").
-# You may not use this file except in compliance with the License.
-#
-# You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
-# or http://www.opensolaris.org/os/licensing.
-# See the License for the specific language governing permissions
-# and limitations under the License.
-#
-# When distributing Covered Code, include this CDDL HEADER in each
-# file and include the License file at usr/src/OPENSOLARIS.LICENSE.
-# If applicable, add the following below this CDDL HEADER, with the
-# fields enclosed by brackets "[]" replaced with your own identifying
-# information: Portions Copyright [yyyy] [name of copyright owner]
-#
-# CDDL HEADER END
-#
-
-#
-# Copyright 2008 Sun Microsystems, Inc.  All rights reserved.
-# Use is subject to license terms.
-#
-# ident	"%Z%%M%	%I%	%E% SMI"
-#
-
-LD_LIBRARY_PATH=/usr/lib/brand/lx
-LD_PRELOAD=/native/usr/lib/brand/lx/lx_thunk.so.1
-LD_BIND_NOW=1
-export LD_LIBRARY_PATH LD_PRELOAD LD_BIND_NOW
-
-exec /native/usr/lib/brand/lx/lx_native \
-	/native/usr/lib/nfs/lockd -P -U 29 -G 29

--- a/usr/src/lib/brand/lx/cmd/lx_native.sh	Fri Jun 11 14:34:29 2010 -0400
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,29 +0,0 @@
-#!/bin/sh
-#
-# CDDL HEADER START
-#
-# The contents of this file are subject to the terms of the
-# Common Development and Distribution License (the "License").
-# You may not use this file except in compliance with the License.
-#
-# You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
-# or http://www.opensolaris.org/os/licensing.
-# See the License for the specific language governing permissions
-# and limitations under the License.
-#
-# When distributing Covered Code, include this CDDL HEADER in each
-# file and include the License file at usr/src/OPENSOLARIS.LICENSE.
-# If applicable, add the following below this CDDL HEADER, with the
-# fields enclosed by brackets "[]" replaced with your own identifying
-# information: Portions Copyright [yyyy] [name of copyright owner]
-#
-# CDDL HEADER END
-#
-
-#
-# Copyright 2006 Sun Microsystems, Inc.  All rights reserved.
-# Use is subject to license terms.
-#
-# ident	"%Z%%M%	%I%	%E% SMI"
-#
-exit 0

--- a/usr/src/lib/brand/lx/cmd/lx_statd.sh	Fri Jun 11 14:34:29 2010 -0400
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,36 +0,0 @@
-#!/bin/sh
-#
-# CDDL HEADER START
-#
-# The contents of this file are subject to the terms of the
-# Common Development and Distribution License (the "License").
-# You may not use this file except in compliance with the License.
-#
-# You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
-# or http://www.opensolaris.org/os/licensing.
-# See the License for the specific language governing permissions
-# and limitations under the License.
-#
-# When distributing Covered Code, include this CDDL HEADER in each
-# file and include the License file at usr/src/OPENSOLARIS.LICENSE.
-# If applicable, add the following below this CDDL HEADER, with the
-# fields enclosed by brackets "[]" replaced with your own identifying
-# information: Portions Copyright [yyyy] [name of copyright owner]
-#
-# CDDL HEADER END
-#
-
-#
-# Copyright 2008 Sun Microsystems, Inc.  All rights reserved.
-# Use is subject to license terms.
-#
-# ident	"%Z%%M%	%I%	%E% SMI"
-#
-
-LD_LIBRARY_PATH=/usr/lib/brand/lx
-LD_PRELOAD=/native/usr/lib/brand/lx/lx_thunk.so.1
-LD_BIND_NOW=1
-export LD_LIBRARY_PATH LD_PRELOAD LD_BIND_NOW
-
-exec /native/usr/lib/brand/lx/lx_native \
-	/native/usr/lib/nfs/statd -P -U 29 -G 29

--- a/usr/src/lib/brand/lx/cmd/lx_thunk.sh	Fri Jun 11 14:34:29 2010 -0400
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,29 +0,0 @@
-#!/bin/sh
-#
-# CDDL HEADER START
-#
-# The contents of this file are subject to the terms of the
-# Common Development and Distribution License (the "License").
-# You may not use this file except in compliance with the License.
-#
-# You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
-# or http://www.opensolaris.org/os/licensing.
-# See the License for the specific language governing permissions
-# and limitations under the License.
-#
-# When distributing Covered Code, include this CDDL HEADER in each
-# file and include the License file at usr/src/OPENSOLARIS.LICENSE.
-# If applicable, add the following below this CDDL HEADER, with the
-# fields enclosed by brackets "[]" replaced with your own identifying
-# information: Portions Copyright [yyyy] [name of copyright owner]
-#
-# CDDL HEADER END
-#
-
-#
-# Copyright 2006 Sun Microsystems, Inc.  All rights reserved.
-# Use is subject to license terms.
-#
-# ident	"%Z%%M%	%I%	%E% SMI"
-#
-exec /native/usr/lib/brand/lx/lx_thunk

--- a/usr/src/lib/brand/lx/librtld_db/Makefile	Fri Jun 11 14:34:29 2010 -0400
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,54 +0,0 @@
-#
-# CDDL HEADER START
-#
-# The contents of this file are subject to the terms of the
-# Common Development and Distribution License (the "License").
-# You may not use this file except in compliance with the License.
-#
-# You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
-# or http://www.opensolaris.org/os/licensing.
-# See the License for the specific language governing permissions
-# and limitations under the License.
-#
-# When distributing Covered Code, include this CDDL HEADER in each
-# file and include the License file at usr/src/OPENSOLARIS.LICENSE.
-# If applicable, add the following below this CDDL HEADER, with the
-# fields enclosed by brackets "[]" replaced with your own identifying
-# information: Portions Copyright [yyyy] [name of copyright owner]
-#
-# CDDL HEADER END
-#
-
-#
-# Copyright 2008 Sun Microsystems, Inc.  All rights reserved.
-# Use is subject to license terms.
-#
-# ident	"%Z%%M%	%I%	%E% SMI"
-#
-
-default: all
-
-include $(SRC)/lib/Makefile.lib
-
-SUBDIRS = $(MACH)
-$(BUILD64)SUBDIRS += $(MACH64)
-
-LINT_SUBDIRS=	$(MACH)
-$(BUILD64)LINT_SUBDIRS += $(MACH64)
-
-all :=          TARGET= all
-clean :=        TARGET= clean
-clobber :=      TARGET= clobber
-install :=      TARGET= install
-lint :=         TARGET= lint
-
-.KEEP_STATE:
-
-all install clean clobber: $(SUBDIRS)
-
-lint: $(LINT_SUBDIRS)
-
-$(SUBDIRS): FRC
-	@cd $@; pwd; $(MAKE) $(TARGET)
-
-FRC:

--- a/usr/src/lib/brand/lx/librtld_db/Makefile.com	Fri Jun 11 14:34:29 2010 -0400
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,83 +0,0 @@
-#
-# CDDL HEADER START
-#
-# The contents of this file are subject to the terms of the
-# Common Development and Distribution License (the "License").
-# You may not use this file except in compliance with the License.
-#
-# You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
-# or http://www.opensolaris.org/os/licensing.
-# See the License for the specific language governing permissions
-# and limitations under the License.
-#
-# When distributing Covered Code, include this CDDL HEADER in each
-# file and include the License file at usr/src/OPENSOLARIS.LICENSE.
-# If applicable, add the following below this CDDL HEADER, with the
-# fields enclosed by brackets "[]" replaced with your own identifying
-# information: Portions Copyright [yyyy] [name of copyright owner]
-#
-# CDDL HEADER END
-#
-
-#
-# Copyright 2008 Sun Microsystems, Inc.  All rights reserved.
-# Use is subject to license terms.
-#
-# ident	"%Z%%M%	%I%	%E% SMI"
-#
-
-LIBRARY =	lx_librtld_db.a
-VERS	=	.1
-COBJS	=	lx_librtld_db.o
-OBJECTS	=	$(COBJS) $(COBJS64)
-
-include $(SRC)/lib/Makefile.lib
-include ../../Makefile.lx
-
-CSRCS =       $(COBJS:%o=../common/%c)
-SRCS  =       $(CSRCS)
-
-SRCDIR =	../common
-UTSBASE	=	$(SRC)/uts
-
-#
-# ATTENTION:
-#	Librtl_db brand plugin libraries should NOT directly invoke any
-#	libproc.so interfaces or be linked against libproc.  If a librtl_db
-#	brand plugin library uses libproc.so interfaces then it may break
-#	any other librtld_db consumers (like mdb) that tries to attach
-#	to a branded process.  The only safe interfaces that the a librtld_db
-#	brand plugin library can use to access a target process are the
-#	proc_service(3PROC) apis.
-#
-DYNFLAGS +=	$(VERSREF) -M../common/mapfile-vers
-LIBS =		$(DYNLIB)
-LDLIBS +=	-lc -lrtld_db
-CFLAGS +=	$(CCVERBOSE)
-CPPFLAGS +=	-D_REENTRANT -I../ -I$(UTSBASE)/common/brand/lx \
-			-I$(SRC)/cmd/sgs/librtld_db/common \
-			-I$(SRC)/cmd/sgs/include \
-			-I$(SRC)/cmd/sgs/include/$(MACH)
-
-ROOTLIBDIR =	$(ROOT)/usr/lib/brand/lx
-ROOTLIBDIR64 =	$(ROOT)/usr/lib/brand/lx/$(MACH64)
-
-#
-# The top level Makefiles define define TEXT_DOMAIN.  But librtld_db.so.1
-# isn't internationalized and this library won't be either.  The only
-# messages that this library can generate are messages used for debugging
-# the operation of the library itself.
-#
-DTEXTDOM =
-
-.KEEP_STATE:
-
-all: $(LIBS)
-
-lint: lintcheck
-
-pics/%64.o:	../common/%.c
-		$(COMPILE.c) -D_ELF64 $(PICFLAGS) -o $@ $<
-		$(POST_PROCESS_O)
-
-include $(SRC)/lib/Makefile.targ

--- a/usr/src/lib/brand/lx/librtld_db/amd64/Makefile	Fri Jun 11 14:34:29 2010 -0400
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,38 +0,0 @@
-#
-# CDDL HEADER START
-#
-# The contents of this file are subject to the terms of the
-# Common Development and Distribution License (the "License").
-# You may not use this file except in compliance with the License.
-#
-# You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
-# or http://www.opensolaris.org/os/licensing.
-# See the License for the specific language governing permissions
-# and limitations under the License.
-#
-# When distributing Covered Code, include this CDDL HEADER in each
-# file and include the License file at usr/src/OPENSOLARIS.LICENSE.
-# If applicable, add the following below this CDDL HEADER, with the
-# fields enclosed by brackets "[]" replaced with your own identifying
-# information: Portions Copyright [yyyy] [name of copyright owner]
-#
-# CDDL HEADER END
-#
-
-#
-# Copyright 2008 Sun Microsystems, Inc.  All rights reserved.
-# Use is subject to license terms.
-#
-# ident	"%Z%%M%	%I%	%E% SMI"
-#
-
-COBJS64 =	lx_librtld_db64.o
-
-include ../Makefile.com
-include $(SRC)/lib/Makefile.lib.64
-
-DYNFLAGS +=	-Mmapfile-vers
-
-CLOBBERFILES = $(ROOTLIBDIR64)/$(DYNLIB)
-
-install: all $(ROOTLIBS64)

--- a/usr/src/lib/brand/lx/librtld_db/amd64/mapfile-vers	Fri Jun 11 14:34:29 2010 -0400
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,44 +0,0 @@
-#
-# CDDL HEADER START
-#
-# The contents of this file are subject to the terms of the
-# Common Development and Distribution License (the "License").
-# You may not use this file except in compliance with the License.
-#
-# You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
-# or http://www.opensolaris.org/os/licensing.
-# See the License for the specific language governing permissions
-# and limitations under the License.
-#
-# When distributing Covered Code, include this CDDL HEADER in each
-# file and include the License file at usr/src/OPENSOLARIS.LICENSE.
-# If applicable, add the following below this CDDL HEADER, with the
-# fields enclosed by brackets "[]" replaced with your own identifying
-# information: Portions Copyright [yyyy] [name of copyright owner]
-#
-# CDDL HEADER END
-#
-
-#
-# Copyright 2009 Sun Microsystems, Inc.  All rights reserved.
-# Use is subject to license terms.
-#
-
-#
-# MAPFILE HEADER START
-#
-# WARNING:  STOP NOW.  DO NOT MODIFY THIS FILE.
-# Object versioning must comply with the rules detailed in
-#
-#	usr/src/lib/README.mapfiles
-#
-# You should not be making modifications here until you've read the most current
-# copy of that file. If you need help, contact a gatekeeper for guidance.
-#
-# MAPFILE HEADER END
-#
-
-SUNWprivate_1.1 {
-	global:
-		rtld_db_brand_ops64;
-};

--- a/usr/src/lib/brand/lx/librtld_db/common/lx_librtld_db.c	Fri Jun 11 14:34:29 2010 -0400
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,575 +0,0 @@
-/*
- * CDDL HEADER START
- *
- * The contents of this file are subject to the terms of the
- * Common Development and Distribution License (the "License").
- * You may not use this file except in compliance with the License.
- *
- * You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
- * or http://www.opensolaris.org/os/licensing.
- * See the License for the specific language governing permissions
- * and limitations under the License.
- *
- * When distributing Covered Code, include this CDDL HEADER in each
- * file and include the License file at usr/src/OPENSOLARIS.LICENSE.
- * If applicable, add the following below this CDDL HEADER, with the
- * fields enclosed by brackets "[]" replaced with your own identifying
- * information: Portions Copyright [yyyy] [name of copyright owner]
- *
- * CDDL HEADER END
- */
-/*
- * Copyright 2008 Sun Microsystems, Inc.  All rights reserved.
- * Use is subject to license terms.
- */
-
-#pragma ident	"%Z%%M%	%I%	%E% SMI"
-
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
-#include <strings.h>
-#include <sys/types.h>
-#include <sys/link.h>
-#include <libproc.h>
-#include <proc_service.h>
-#include <rtld_db.h>
-#include <synch.h>
-
-#include <sys/lx_brand.h>
-
-/*
- * ATTENTION:
- *	Librtl_db brand plugin libraries should NOT directly invoke any
- *	libproc.so interfaces or be linked against libproc.  If a librtl_db
- *	brand plugin library uses libproc.so interfaces then it may break
- *	any other librtld_db consumers (like mdb) that tries to attach
- *	to a branded process.  The only safe interfaces that the a librtld_db
- *	brand plugin library can use to access a target process are the
- *	proc_service(3PROC) apis.
- */
-
-/*
- * M_DATA comes from some streams header file but is also redifined in
- * _rtld_db.h, so nuke the old streams definition here.
- */
-#ifdef M_DATA
-#undef M_DATA
-#endif /* M_DATA */
-
-/*
- * For 32-bit versions of this library, this file get's compiled once.
- * For 64-bit versions of this library, this file get's compiled twice,
- * once with _ELF64 defined and once without.  The expectation is that
- * the 64-bit version of the library can properly deal with both 32-bit
- * and 64-bit elf files, hence in the 64-bit library there are two copies
- * of all the interfaces in this file, one set named *32 and one named *64.
- *
- * This also means that we need to be careful when declaring local pointers
- * that point to objects in another processes address space, since these
- * pointers may not match the current processes pointer width.  Basically,
- * we should avoid using data types that change size between 32 and 64 bit
- * modes like: long, void *, uintprt_t, caddr_t, psaddr_t, size_t, etc.
- * Instead we should declare all pointers as uint32_t.  Then when we
- * are compiled to deal with 64-bit targets we'll re-define uint32_t
- * to be a uint64_t.
- *
- * Finally, one last importante note.  All the 64-bit elf file code
- * is never used and can't be tested.  This is because we don't actually
- * support 64-bit Linux processes yet.  The reason that we have it here
- * is because we want to support debugging 32-bit elf targets with the
- * 64-bit version of this library, so we need to have a 64-bit version
- * of this library.  But a 64-bit version of this library is expected
- * to provide debugging interfaces for both 32 and 64-bit elf targets.
- * So we provide the 64-bit elf target interfaces, but they will never
- * be invoked and are untested.  If we ever add support for 64-bit elf
- * Linux processes, we'll need to verify that this code works correctly
- * for those targets.
- */
-#ifdef _LP64
-#ifdef _ELF64
-#define	lx_ldb_get_dyns32		lx_ldb_get_dyns64
-#define	lx_ldb_init32			lx_ldb_init64
-#define	lx_ldb_fini32			lx_ldb_fini64
-#define	lx_ldb_loadobj_iter32		lx_ldb_loadobj_iter64
-#define	lx_ldb_getauxval32		lx_ldb_getauxval64
-#define	lx_elf_props32			lx_elf_props64
-#define	_rd_get_dyns32			_rd_get_dyns64
-#define	_rd_get_ehdr32			_rd_get_ehdr64
-#define	uint32_t			uint64_t
-#define	Elf32_Dyn			Elf64_Dyn
-#define	Elf32_Ehdr			Elf64_Ehdr
-#define	Elf32_Phdr			Elf64_Phdr
-#endif /* _ELF64 */
-#endif /* _LP64 */
-
-/* Included from usr/src/cmd/sgs/librtld_db/common */
-#include <_rtld_db.h>
-
-typedef struct lx_rd {
-	rd_agent_t		*lr_rap;
-	struct ps_prochandle	*lr_php;	/* proc handle pointer */
-	uint32_t		lr_rdebug;	/* address of lx r_debug */
-	uint32_t		lr_exec;	/* base address of executable */
-} lx_rd_t;
-
-typedef struct lx_link_map {
-	uint32_t lxm_addr;	/* Base address shared object is loaded at.  */
-	uint32_t lxm_name;	/* Absolute file name object was found in.  */
-	uint32_t lxm_ld;	/* Dynamic section of the shared object.  */
-	uint32_t lxm_next;	/* Chain of loaded objects.  */
-} lx_link_map_t;
-
-typedef struct lx_r_debug {
-	int r_version;		/* Version number for this protocol.  */
-	uint32_t	r_map;	/* Head of the chain of loaded objects. */
-
-	/*
-	 * This is the address of a function internal to the run-time linker,
-	 * that will always be called when the linker begins to map in a
-	 * library or unmap it, and again when the mapping change is complete.
-	 * The debugger can set a breakpoint at this address if it wants to
-	 * notice shared object mapping changes.
-	 */
-	uint32_t	r_brk;
-	r_state_e	r_state; /* defined the same way between lx/solaris */
-	uint32_t	r_ldbase; /* Base address the linker is loaded at. */
-} lx_r_debug_t;
-
-static uint32_t
-lx_ldb_getauxval32(struct ps_prochandle *php, int type)
-{
-	const auxv_t		*auxvp = NULL;
-
-	if (ps_pauxv(php, &auxvp) != PS_OK)
-		return ((uint32_t)-1);
-
-	while (auxvp->a_type != AT_NULL) {
-		if (auxvp->a_type == type)
-			return ((uint32_t)(uintptr_t)auxvp->a_un.a_ptr);
-		auxvp++;
-	}
-	return ((uint32_t)-1);
-}
-
-/*
- * A key difference between the linux linker and ours' is that the linux
- * linker adds the base address of segments to certain values in the
- * segments' ELF header. As an example, look at the address of the
- * DT_HASH hash table in a Solaris section - it is a relative address
- * which locates the start of the hash table, relative to the beginning
- * of the ELF file. However, when the linux linker loads a section, it
- * modifies the in-memory ELF image by changing address of the hash
- * table to be an absolute address. This is only done for libraries - not for
- * executables.
- *
- * Solaris tools expect the relative address to remain relative, so
- * here we will modify the in-memory ELF image so that it once again
- * contains relative addresses.
- *
- * To accomplish this, we walk through all sections in the target.
- * Linux sections are identified by pointing to the linux linker or libc in the
- * DT_NEEDED section. For all matching sections, we subtract the segment
- * base address to get back to relative addresses.
- */
-static rd_err_e
-lx_ldb_get_dyns32(rd_helper_data_t rhd,
-    psaddr_t addr, void **dynpp, size_t *dynpp_sz)
-{
-	lx_rd_t			*lx_rd = (lx_rd_t *)rhd;
-	rd_agent_t		*rap = lx_rd->lr_rap;
-	Elf32_Ehdr		ehdr;
-	Elf32_Dyn		*dynp = NULL;
-	size_t			dynp_sz;
-	uint_t			ndyns;
-	int			i;
-
-	ps_plog("lx_ldb_get_dyns: invoked for object at 0x%p", addr);
-
-	/* Read in a copy of the ehdr */
-	if (_rd_get_ehdr32(rap, addr, &ehdr, NULL) != RD_OK) {
-		ps_plog("lx_ldb_get_dyns: _rd_get_ehdr() failed");
-		return (RD_ERR);
-	}
-
-	/* read out the PT_DYNAMIC elements for this object */
-	if (_rd_get_dyns32(rap, addr, &dynp, &dynp_sz) != RD_OK) {
-		ps_plog("lx_ldb_get_dyns: _rd_get_dyns() failed");
-		return (RD_ERR);
-	}
-
-	/*
-	 * From here on out if we encounter an error we'll just return
-	 * success and pass back the unmolested dynamic elements that
-	 * we've already obtained.
-	 */
-	*dynpp = dynp;
-	*dynpp_sz = dynp_sz;
-	ndyns = dynp_sz / sizeof (Elf32_Dyn);
-
-	/* If this isn't a dynamic object, there's nothing left todo */
-	if (ehdr.e_type != ET_DYN) {
-		ps_plog("lx_ldb_get_dyns: done: not a shared object");
-		return (RD_OK);
-	}
-
-	/*
-	 * Before we blindly start changing dynamic section addresses
-	 * we need to figure out if the current object that we're looking
-	 * at is a linux object or a solaris object.  To do this first
-	 * we need to find the string tab dynamic section element.
-	 */
-	for (i = 0; i < ndyns; i++) {
-		if (dynp[i].d_tag == DT_STRTAB)
-			break;
-	}
-	if (i == ndyns) {
-		ps_plog("lx_ldb_get_dyns: "
-		    "failed to find string tab in the dynamic section");
-		return (RD_OK);
-	}
-
-	/*
-	 * Check if the strtab value looks like an offset or an address.
-	 * It's an offset if the value is less then the base address that
-	 * the object is loaded at, or if the value is less than the offset
-	 * of the section headers in the same elf object.  This check isn't
-	 * perfect, but in practice it's good enough.
-	 */
-	if ((dynp[i].d_un.d_ptr < addr) ||
-	    (dynp[i].d_un.d_ptr < ehdr.e_shoff)) {
-		ps_plog("lx_ldb_get_dyns: "
-		    "doesn't appear to be an lx object");
-		return (RD_OK);
-	}
-
-	/*
-	 * This seems to be a a linux object, so we'll patch up the dynamic
-	 * section addresses
-	 */
-	ps_plog("lx_ldb_get_dyns: "
-	    "patching up lx object dynamic section addresses");
-	for (i = 0; i < ndyns; i++) {
-		switch (dynp[i].d_tag) {
-		case DT_PLTGOT:
-		case DT_HASH:
-		case DT_STRTAB:
-		case DT_SYMTAB:
-		case DT_RELA:
-		case DT_REL:
-		case DT_DEBUG:
-		case DT_JMPREL:
-		case DT_VERSYM:
-			if (dynp[i].d_un.d_val > addr) {
-				dynp[i].d_un.d_ptr -= addr;
-			}
-			break;
-		default:
-			break;
-		}
-	}
-	return (RD_OK);
-}
-
-static void
-lx_ldb_fini32(rd_helper_data_t rhd)
-{
-	lx_rd_t *lx_rd = (lx_rd_t *)rhd;
-	ps_plog("lx_ldb_fini: cleaning up lx helper");
-	free(lx_rd);
-}
-
-/*
- * The linux linker has an r_debug structure somewhere in its data section that
- * contains the address of the head of the link map list. To find this, we will
- * use the DT_DEBUG token in the executable's dynamic section. The linux linker
- * wrote the address of its r_debug structure to the DT_DEBUG dynamic entry. We
- * get the address of the executable's program headers from the
- * AT_SUN_BRAND_LX_PHDR aux vector entry. From there, we calculate the
- * address of the Elf header, and from there we can easily get to the DT_DEBUG
- * entry.
- */
-static rd_helper_data_t
-lx_ldb_init32(rd_agent_t *rap, struct ps_prochandle *php)
-{
-	lx_rd_t		*lx_rd;
-	uint32_t	addr, phdr_addr, dyn_addr;
-	Elf32_Dyn	*dyn;
-	Elf32_Phdr	phdr, *ph, *phdrs;
-	Elf32_Ehdr	ehdr;
-	int		i, dyn_count;
-
-	lx_rd = calloc(sizeof (lx_rd_t), 1);
-	if (lx_rd == NULL) {
-		ps_plog("lx_ldb_init: cannot allocate memory");
-		return (NULL);
-	}
-	lx_rd->lr_rap = rap;
-	lx_rd->lr_php = php;
-
-	phdr_addr = lx_ldb_getauxval32(php, AT_SUN_BRAND_LX_PHDR);
-	if (phdr_addr == (uint32_t)-1) {
-		ps_plog("lx_ldb_init: no LX_PHDR found in aux vector");
-		return (NULL);
-	}
-	ps_plog("lx_ldb_init: found LX_PHDR auxv phdr at: 0x%p",
-	    phdr_addr);
-
-	if (ps_pread(php, phdr_addr, &phdr, sizeof (phdr)) != PS_OK) {
-		ps_plog("lx_ldb_init: couldn't read phdr at 0x%p",
-		    phdr_addr);
-		free(lx_rd);
-		return (NULL);
-	}
-
-	/* The ELF headher should be before the program header in memory */
-	lx_rd->lr_exec = addr = phdr_addr - phdr.p_offset;
-	if (ps_pread(php, addr, &ehdr, sizeof (ehdr)) != PS_OK) {
-		ps_plog("lx_ldb_init: couldn't read ehdr at 0x%p",
-		    lx_rd->lr_exec);
-		free(lx_rd);
-		return (NULL);
-	}
-	ps_plog("lx_ldb_init: read ehdr at: 0x%p", addr);
-
-	if ((phdrs = malloc(ehdr.e_phnum * ehdr.e_phentsize)) == NULL) {
-		ps_plog("lx_ldb_init: couldn't alloc phdrs memory");
-		free(lx_rd);
-		return (NULL);
-	}
-
-	if (ps_pread(php, phdr_addr, phdrs, ehdr.e_phnum * ehdr.e_phentsize) !=
-	    PS_OK) {
-		ps_plog("lx_ldb_init: couldn't read phdrs at 0x%p",
-		    phdr_addr);
-		free(lx_rd);
-		free(phdrs);
-		return (NULL);
-	}
-	ps_plog("lx_ldb_init: read %d phdrs at: 0x%p",
-	    ehdr.e_phnum, phdr_addr);
-
-	for (i = 0, ph = phdrs; i < ehdr.e_phnum; i++,
-	    /*LINTED */
-	    ph = (Elf32_Phdr *)((char *)ph + ehdr.e_phentsize)) {
-		if (ph->p_type == PT_DYNAMIC)
-			break;
-	}
-	if (i == ehdr.e_phnum) {
-		ps_plog("lx_ldb_init: no PT_DYNAMIC in executable");
-		free(lx_rd);
-		free(phdrs);
-		return (NULL);
-	}
-	ps_plog("lx_ldb_init: found PT_DYNAMIC phdr[%d] at: 0x%p",
-	    i, (phdr_addr + ((char *)ph - (char *)phdrs)));
-
-	if ((dyn = malloc(ph->p_filesz)) == NULL) {
-		ps_plog("lx_ldb_init: couldn't alloc for PT_DYNAMIC");
-		free(lx_rd);
-		free(phdrs);
-		return (NULL);
-	}
-
-	dyn_addr = addr + ph->p_offset;
-	dyn_count = ph->p_filesz / sizeof (Elf32_Dyn);
-	if (ps_pread(php, dyn_addr, dyn, ph->p_filesz) != PS_OK) {
-		ps_plog("lx_ldb_init: couldn't read dynamic at 0x%p",
-		    dyn_addr);
-		free(lx_rd);
-		free(phdrs);
-		free(dyn);
-		return (NULL);
-	}
-	ps_plog("lx_ldb_init: read %d dynamic headers at: 0x%p",
-	    dyn_count, dyn_addr);
-
-	for (i = 0; i < dyn_count; i++) {
-		if (dyn[i].d_tag == DT_DEBUG) {
-			lx_rd->lr_rdebug = dyn[i].d_un.d_ptr;
-			break;
-		}
-	}
-	free(phdrs);
-	free(dyn);
-
-	if (lx_rd->lr_rdebug == 0) {
-		ps_plog("lx_ldb_init: no DT_DEBUG found in exe");
-		free(lx_rd);
-		return (NULL);
-	}
-	ps_plog("lx_ldb_init: found DT_DEBUG: 0x%p", lx_rd->lr_rdebug);
-
-	return ((rd_helper_data_t)lx_rd);
-}
-
-/*
- * Given the address of an ELF object in the target, return its size and
- * the proper link map ID.
- */
-static size_t
-lx_elf_props32(struct ps_prochandle *php, uint32_t addr, psaddr_t *data_addr)
-{
-	Elf32_Ehdr	ehdr;
-	Elf32_Phdr	*phdrs, *ph;
-	int		i;
-	uint32_t	min = (uint32_t)-1;
-	uint32_t	max = 0;
-	size_t		sz;
-
-	if (ps_pread(php, addr, &ehdr, sizeof (ehdr)) != PS_OK) {
-		ps_plog("lx_elf_props: Couldn't read ELF header at 0x%p",
-		    addr);
-		return (0);
-	}
-
-	if ((phdrs = malloc(ehdr.e_phnum * ehdr.e_phentsize)) == NULL)
-		return (0);
-
-	if (ps_pread(php, addr + ehdr.e_phoff, phdrs, ehdr.e_phnum *
-	    ehdr.e_phentsize) != PS_OK) {
-		ps_plog("lx_elf_props: Couldn't read program headers at 0x%p",
-		    addr + ehdr.e_phoff);
-		return (0);
-	}
-
-	for (i = 0, ph = phdrs; i < ehdr.e_phnum; i++,
-	    /*LINTED */
-	    ph = (Elf32_Phdr *)((char *)ph + ehdr.e_phentsize)) {
-
-		if (ph->p_type != PT_LOAD)
-			continue;
-
-		if ((ph->p_flags & (PF_W | PF_R)) == (PF_W | PF_R)) {
-			*data_addr = ph->p_vaddr;
-			if (ehdr.e_type == ET_DYN)
-				*data_addr += addr;
-			if (*data_addr & (ph->p_align - 1))
-				*data_addr = *data_addr & (~(ph->p_align -1));
-		}
-
-		if (ph->p_vaddr < min)
-			min = ph->p_vaddr;
-
-		if (ph->p_vaddr > max) {
-			max = ph->p_vaddr;
-			sz = ph->p_memsz + max - min;
-			if (sz & (ph->p_align - 1))
-				sz = (sz & (~(ph->p_align - 1))) + ph->p_align;
-		}
-	}
-
-	free(phdrs);
-	return (sz);
-}
-
-static int
-lx_ldb_loadobj_iter32(rd_helper_data_t rhd, rl_iter_f *cb, void *client_data)
-{
-	lx_rd_t			*lx_rd = (lx_rd_t *)rhd;
-	struct ps_prochandle	*php = lx_rd->lr_php;
-	lx_r_debug_t		r_debug;
-	lx_link_map_t		map;
-	uint32_t		p = NULL;
-	int			rc;
-	rd_loadobj_t		exec;
-
-	if ((rc = ps_pread(php, (psaddr_t)lx_rd->lr_rdebug, &r_debug,
-	    sizeof (r_debug))) != PS_OK) {
-		ps_plog("lx_ldb_loadobj_iter: "
-		    "Couldn't read linux r_debug at 0x%p", lx_rd->lr_rdebug);
-		return (rc);
-	}
-
-	p = r_debug.r_map;
-
-	/*
-	 * The first item on the link map list is for the executable, but it
-	 * doesn't give us any useful information about it. We need to
-	 * synthesize a rd_loadobj_t for the client.
-	 *
-	 * Linux doesn't give us the executable name, so we'll get it from
-	 * the AT_EXECNAME entry instead.
-	 */
-	if ((rc = ps_pread(php, (psaddr_t)p, &map, sizeof (map))) != PS_OK) {
-		ps_plog("lx_ldb_loadobj_iter: "
-		    "Couldn't read linux link map at 0x%p", p);
-		return (rc);
-	}
-
-	bzero(&exec, sizeof (exec));
-	exec.rl_base = lx_rd->lr_exec;
-	exec.rl_dynamic = map.lxm_ld;
-	exec.rl_nameaddr = lx_ldb_getauxval32(php, AT_SUN_EXECNAME);
-	exec.rl_lmident = LM_ID_BASE;
-
-	exec.rl_bend = exec.rl_base +
-	    lx_elf_props32(php, lx_rd->lr_exec, &exec.rl_data_base);
-
-	if ((*cb)(&exec, client_data) == 0) {
-		ps_plog("lx_ldb_loadobj_iter: "
-		    "client callb failed for executable");
-		return (PS_ERR);
-	}
-
-	for (p = map.lxm_next; p != NULL; p = map.lxm_next) {
-		rd_loadobj_t	obj;
-
-		if ((rc = ps_pread(php, (psaddr_t)p, &map, sizeof (map))) !=
-		    PS_OK) {
-			ps_plog("lx_ldb_loadobj_iter: "
-			    "Couldn't read lk map at %p", p);
-			return (rc);
-		}
-
-		/*
-		 * The linux link map has less information than the Solaris one.
-		 * We need to go fetch the missing information from the ELF
-		 * headers.
-		 */
-
-		obj.rl_nameaddr = (psaddr_t)map.lxm_name;
-		obj.rl_base = map.lxm_addr;
-		obj.rl_refnameaddr = (psaddr_t)map.lxm_name;
-		obj.rl_plt_base = NULL;
-		obj.rl_plt_size = 0;
-		obj.rl_lmident = LM_ID_BASE;
-
-		/*
-		 * Ugh - we have to walk the ELF stuff, find the PT_LOAD
-		 * sections, and calculate the end of the file's mappings
-		 * ourselves.
-		 */
-
-		obj.rl_bend = map.lxm_addr +
-		    lx_elf_props32(php, map.lxm_addr, &obj.rl_data_base);
-		obj.rl_padstart = obj.rl_base;
-		obj.rl_padend = obj.rl_bend;
-		obj.rl_dynamic = map.lxm_ld;
-		obj.rl_tlsmodid = 0;
-
-		ps_plog("lx_ldb_loadobj_iter: 0x%p to 0x%p",
-		    obj.rl_base, obj.rl_bend);
-
-		if ((*cb)(&obj, client_data) == 0) {
-			ps_plog("lx_ldb_loadobj_iter: "
-			    "Client callback failed on %s", map.lxm_name);
-			return (rc);
-		}
-	}
-	return (RD_OK);
-}
-
-/*
- * Librtld_db plugin linkage struct.
- *
- * When we get loaded by librtld_db, it will look for the symbol below
- * to find our plugin entry points.
- */
-rd_helper_ops_t RTLD_DB_BRAND_OPS = {
-	LM_ID_BRAND,
-	lx_ldb_init32,
-	lx_ldb_fini32,
-	lx_ldb_loadobj_iter32,
-	lx_ldb_get_dyns32
-};

--- a/usr/src/lib/brand/lx/librtld_db/common/mapfile-vers	Fri Jun 11 14:34:29 2010 -0400
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,58 +0,0 @@
-#
-# CDDL HEADER START
-#
-# The contents of this file are subject to the terms of the
-# Common Development and Distribution License (the "License").
-# You may not use this file except in compliance with the License.
-#
-# You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
-# or http://www.opensolaris.org/os/licensing.
-# See the License for the specific language governing permissions
-# and limitations under the License.
-#
-# When distributing Covered Code, include this CDDL HEADER in each
-# file and include the License file at usr/src/OPENSOLARIS.LICENSE.
-# If applicable, add the following below this CDDL HEADER, with the
-# fields enclosed by brackets "[]" replaced with your own identifying
-# information: Portions Copyright [yyyy] [name of copyright owner]
-#
-# CDDL HEADER END
-#
-
-#
-# Copyright 2009 Sun Microsystems, Inc.  All rights reserved.
-# Use is subject to license terms.
-#
-
-#
-# MAPFILE HEADER START
-#
-# WARNING:  STOP NOW.  DO NOT MODIFY THIS FILE.
-# Object versioning must comply with the rules detailed in
-#
-#	usr/src/lib/README.mapfiles
-#
-# You should not be making modifications here until you've read the most current
-# copy of that file. If you need help, contact a gatekeeper for guidance.
-#
-# MAPFILE HEADER END
-#
-
-{
-	global:
-		rtld_db_brand_ops32;
-	local:
-		*;
-};
-
-#Externally defined symbols
-{
-    global:
-	ps_pauxv =		NODIRECT PARENT;
-	ps_pdmodel =		NODIRECT PARENT;
-	ps_pglobal_lookup =	NODIRECT PARENT;
-	ps_pglobal_sym =	NODIRECT PARENT;
-	ps_plog =		NODIRECT PARENT;
-	ps_pread =		NODIRECT PARENT;
-	ps_pwrite =		NODIRECT PARENT;
-};

--- a/usr/src/lib/brand/lx/librtld_db/i386/Makefile	Fri Jun 11 14:34:29 2010 -0400
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,33 +0,0 @@
-#
-# CDDL HEADER START
-#
-# The contents of this file are subject to the terms of the
-# Common Development and Distribution License (the "License").
-# You may not use this file except in compliance with the License.
-#
-# You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
-# or http://www.opensolaris.org/os/licensing.
-# See the License for the specific language governing permissions
-# and limitations under the License.
-#
-# When distributing Covered Code, include this CDDL HEADER in each
-# file and include the License file at usr/src/OPENSOLARIS.LICENSE.
-# If applicable, add the following below this CDDL HEADER, with the
-# fields enclosed by brackets "[]" replaced with your own identifying
-# information: Portions Copyright [yyyy] [name of copyright owner]
-#
-# CDDL HEADER END
-#
-
-#
-# Copyright 2008 Sun Microsystems, Inc.  All rights reserved.
-# Use is subject to license terms.
-#
-#ident	"%Z%%M%	%I%	%E% SMI"
-#
-
-include ../Makefile.com
-
-CLOBBERFILES =	$(ROOTLIBDIR)/$(DYNLIB)
-
-install: all $(ROOTLIBS)

--- a/usr/src/lib/brand/lx/lx_brand/Makefile	Fri Jun 11 14:34:29 2010 -0400
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,53 +0,0 @@
-#
-# CDDL HEADER START
-#
-# The contents of this file are subject to the terms of the
-# Common Development and Distribution License (the "License").
-# You may not use this file except in compliance with the License.
-#
-# You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
-# or http://www.opensolaris.org/os/licensing.
-# See the License for the specific language governing permissions
-# and limitations under the License.
-#
-# When distributing Covered Code, include this CDDL HEADER in each
-# file and include the License file at usr/src/OPENSOLARIS.LICENSE.
-# If applicable, add the following below this CDDL HEADER, with the
-# fields enclosed by brackets "[]" replaced with your own identifying
-# information: Portions Copyright [yyyy] [name of copyright owner]
-#
-# CDDL HEADER END
-#
-
-#
-# Copyright 2006 Sun Microsystems, Inc.  All rights reserved.
-# Use is subject to license terms.
-#
-# ident	"%Z%%M%	%I%	%E% SMI"
-#
-
-include ../../../Makefile.lib
-
-default:	all
-
-SUBDIRS=	$(MACH)
-
-LINT_SUBDIRS=	$(MACH)
-
-all :=          TARGET= all
-clean :=        TARGET= clean
-clobber :=      TARGET= clobber
-install :=      TARGET= install
-lint :=         TARGET= lint
-_msg :=		TARGET= _msg
-
-.KEEP_STATE:
-
-all install clean clobber _msg:	$(SUBDIRS)
-
-lint: $(LINT_SUBDIRS)
-
-$(SUBDIRS): FRC
-	@cd $@; pwd; $(MAKE) $(TARGET)
-
-FRC:

--- a/usr/src/lib/brand/lx/lx_brand/Makefile.com	Fri Jun 11 14:34:29 2010 -0400
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,102 +0,0 @@
-#
-# CDDL HEADER START
-#
-# The contents of this file are subject to the terms of the
-# Common Development and Distribution License (the "License").
-# You may not use this file except in compliance with the License.
-#
-# You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
-# or http://www.opensolaris.org/os/licensing.
-# See the License for the specific language governing permissions
-# and limitations under the License.
-#
-# When distributing Covered Code, include this CDDL HEADER in each
-# file and include the License file at usr/src/OPENSOLARIS.LICENSE.
-# If applicable, add the following below this CDDL HEADER, with the
-# fields enclosed by brackets "[]" replaced with your own identifying
-# information: Portions Copyright [yyyy] [name of copyright owner]
-#
-# CDDL HEADER END
-#
-#
-# Copyright 2006 Sun Microsystems, Inc.  All rights reserved.
-# Use is subject to license terms.
-#
-# ident	"%Z%%M%	%I%	%E% SMI"
-#
-
-LX_CMN  =	$(SRC)/common/brand/lx
-
-LIBRARY =	lx_brand.a
-VERS	=	.1
-COBJS	=	clock.o			\
-		clone.o			\
-		debug.o			\
-		dir.o			\
-		file.o			\
-		fcntl.o			\
-		fork.o			\
-		id.o			\
-		ioctl.o			\
-		iovec.o			\
-		lx_brand.o		\
-		lx_thunk_server.o	\
-		mem.o			\
-		misc.o			\
-		module.o		\
-		mount.o			\
-		open.o			\
-		pgrp.o			\
-		poll_select.o		\
-		priority.o		\
-		ptrace.o		\
-		rlimit.o		\
-		sched.o			\
-		sendfile.o		\
-		signal.o		\
-		socket.o		\
-		stat.o			\
-		statfs.o		\
-		sysctl.o		\
-		sysv_ipc.o		\
-		time.o			\
-		truncate.o		\
-		wait.o
-
-CMNOBJS =	lx_signum.o
-ASOBJS	=	lx_handler.o lx_runexe.o lx_crt.o
-OBJECTS	=	$(CMNOBJS) $(COBJS) $(ASOBJS)
-
-include ../../Makefile.lx
-include ../../../../Makefile.lib
-
-CSRCS   =	$(COBJS:%o=../common/%c) $(CMNOBJS:%o=$(LX_CMN)/%c)
-ASSRCS  =	$(ASOBJS:%o=$(ISASRCDIR)/%s)
-SRCS    =	$(CSRCS) $(ASSRCS)
-
-SRCDIR =	../common
-UTSBASE	=	../../../../../uts
-
-LIBS =		$(DYNLIB)
-LDLIBS +=	-lc -lsocket -lmapmalloc -lproc -lrtld_db
-DYNFLAGS +=	-Wl,-e_start -Wl,-I/native/lib/ld.so.1 -M../common/mapfile
-CFLAGS +=	$(CCVERBOSE)
-CPPFLAGS +=	-D_REENTRANT -I../ -I$(UTSBASE)/common/brand/lx -I$(LX_CMN)
-ASFLAGS =	-P $(ASFLAGS_$(CURTYPE)) -D_ASM -I../	\
-			-I$(UTSBASE)/common/brand/lx
-
-.KEEP_STATE:
-
-all: $(LIBS)
-
-lint: lintcheck
-
-include ../../../../Makefile.targ
-
-pics/%.o: $(ISASRCDIR)/%.s
-	$(COMPILE.s) -o $@ $<
-	$(POST_PROCESS_O)
-
-pics/%.o: $(LX_CMN)/%.c
-	$(COMPILE.c) -o $@ $<
-	$(POST_PROCESS_O)

--- a/usr/src/lib/brand/lx/lx_brand/common/clock.c	Fri Jun 11 14:34:29 2010 -0400
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,116 +0,0 @@
-/*
- * CDDL HEADER START
- *
- * The contents of this file are subject to the terms of the
- * Common Development and Distribution License (the "License").
- * You may not use this file except in compliance with the License.
- *
- * You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
- * or http://www.opensolaris.org/os/licensing.
- * See the License for the specific language governing permissions
- * and limitations under the License.
- *
- * When distributing Covered Code, include this CDDL HEADER in each
- * file and include the License file at usr/src/OPENSOLARIS.LICENSE.
- * If applicable, add the following below this CDDL HEADER, with the
- * fields enclosed by brackets "[]" replaced with your own identifying
- * information: Portions Copyright [yyyy] [name of copyright owner]
- *
- * CDDL HEADER END
- */
-
-/*
- * Copyright 2007 Sun Microsystems, Inc.  All rights reserved.
- * Use is subject to license terms.
- */
-
-#pragma ident	"%Z%%M%	%I%	%E% SMI"
-
-#include <errno.h>
-#include <string.h>
-#include <time.h>
-#include <sys/lx_misc.h>
-
-/*
- * Linux uses different values for it clock identifiers, so we have to do basic
- * translations between the two.  Thankfully, both Linux and Solaris implement
- * the same POSIX SUSv3 clock types, so the semantics should be identical.
- */
-
-static int ltos_clock[] = {
-	CLOCK_REALTIME,
-	CLOCK_MONOTONIC,
-	CLOCK_PROCESS_CPUTIME_ID,
-	CLOCK_THREAD_CPUTIME_ID
-};
-
-#define	LX_CLOCK_MAX	(sizeof (ltos_clock) / sizeof (ltos_clock[0]))
-
-int
-lx_clock_gettime(int clock, struct timespec *tp)
-{
-	struct timespec ts;
-
-	if (clock < 0 || clock > LX_CLOCK_MAX)
-		return (-EINVAL);
-
-	if (clock_gettime(ltos_clock[clock], &ts) < 0)
-		return (-errno);
-
-	return ((uucopy(&ts, tp, sizeof (struct timespec)) < 0) ? -EFAULT : 0);
-}
-
-int
-lx_clock_settime(int clock, struct timespec *tp)
-{
-	struct timespec ts;
-
-	if (clock < 0 || clock > LX_CLOCK_MAX)
-		return (-EINVAL);
-
-	if (uucopy(tp, &ts, sizeof (struct timespec)) < 0)
-		return (-EFAULT);
-
-	return ((clock_settime(ltos_clock[clock], &ts) < 0) ? -errno : 0);
-}
-
-int
-lx_clock_getres(int clock, struct timespec *tp)
-{
-	struct timespec ts;
-
-	if (clock < 0 || clock > LX_CLOCK_MAX)
-		return (-EINVAL);
-
-	if (clock_getres(ltos_clock[clock], &ts) < 0)
-		return (-errno);
-
-	return ((uucopy(&ts, tp, sizeof (struct timespec)) < 0) ? -EFAULT : 0);
-}
-
-int
-lx_clock_nanosleep(int clock, int flags, struct timespec *rqtp,
-    struct timespec *rmtp)
-{
-	struct timespec rqt, rmt;
-
-	if (clock < 0 || clock > LX_CLOCK_MAX)
-		return (-EINVAL);
-
-	if (uucopy(rqtp, &rqt, sizeof (struct timespec)) < 0)
-		return (-EFAULT);
-
-	/* the TIMER_RELTIME and TIMER_ABSTIME flags are the same on Linux */
-	if (clock_nanosleep(ltos_clock[clock], flags, &rqt, &rmt) < 0)
-		return (-errno);
-
-	/*
-	 * Only copy values to rmtp if the timer is TIMER_RELTIME and rmtp is
-	 * non-NULL.
-	 */
-	if (((flags & TIMER_RELTIME) == TIMER_RELTIME) && (rmtp != NULL) &&
-	    (uucopy(&rmt, rmtp, sizeof (struct timespec)) < 0))
-		return (-EFAULT);
-
-	return (0);
-}

--- a/usr/src/lib/brand/lx/lx_brand/common/clone.c	Fri Jun 11 14:34:29 2010 -0400
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,546 +0,0 @@
-/*
- * CDDL HEADER START
- *
- * The contents of this file are subject to the terms of the
- * Common Development and Distribution License (the "License").
- * You may not use this file except in compliance with the License.
- *
- * You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
- * or http://www.opensolaris.org/os/licensing.
- * See the License for the specific language governing permissions
- * and limitations under the License.
- *
- * When distributing Covered Code, include this CDDL HEADER in each
- * file and include the License file at usr/src/OPENSOLARIS.LICENSE.
- * If applicable, add the following below this CDDL HEADER, with the
- * fields enclosed by brackets "[]" replaced with your own identifying
- * information: Portions Copyright [yyyy] [name of copyright owner]
- *
- * CDDL HEADER END
- */
-
-/*
- * Copyright 2008 Sun Microsystems, Inc.  All rights reserved.
- * Use is subject to license terms.
- */
-
-#pragma ident	"%Z%%M%	%I%	%E% SMI"
-
-#include <assert.h>
-#include <errno.h>
-#include <stdlib.h>
-#include <signal.h>
-#include <unistd.h>
-#include <ucontext.h>
-#include <thread.h>
-#include <strings.h>
-#include <libintl.h>
-#include <sys/regset.h>
-#include <sys/syscall.h>
-#include <sys/inttypes.h>
-#include <sys/param.h>
-#include <sys/types.h>
-#include <sys/segments.h>
-#include <signal.h>
-#include <sys/lx_misc.h>
-#include <sys/lx_types.h>
-#include <sys/lx_signal.h>
-#include <sys/lx_syscall.h>
-#include <sys/lx_brand.h>
-#include <sys/lx_debug.h>
-#include <sys/lx_thread.h>
-
-#define	LX_CSIGNAL		0x000000ff
-#define	LX_CLONE_VM		0x00000100
-#define	LX_CLONE_FS		0x00000200
-#define	LX_CLONE_FILES		0x00000400
-#define	LX_CLONE_SIGHAND	0x00000800
-#define	LX_CLONE_PID		0x00001000
-#define	LX_CLONE_PTRACE		0x00002000
-#define	LX_CLONE_VFORK		0x00004000
-#define	LX_CLONE_PARENT		0x00008000
-#define	LX_CLONE_THREAD		0x00010000
-#define	LX_CLONE_SYSVSEM	0x00040000
-#define	LX_CLONE_SETTLS		0x00080000
-#define	LX_CLONE_PARENT_SETTID	0x00100000
-#define	LX_CLONE_CHILD_CLEARTID	0x00200000
-#define	LX_CLONE_DETACH		0x00400000
-#define	LX_CLONE_CHILD_SETTID	0x01000000
-
-#define	SHARED_AS	\
-	(LX_CLONE_VM | LX_CLONE_FS | LX_CLONE_FILES | LX_CLONE_SIGHAND)
-#define	CLONE_VFORK (LX_CLONE_VM | LX_CLONE_VFORK)
-#define	CLONE_TD (LX_CLONE_THREAD|LX_CLONE_DETACH)
-
-#define	IS_FORK(f)	(((f) & SHARED_AS) == 0)
-#define	IS_VFORK(f)	(((f) & CLONE_VFORK) == CLONE_VFORK)
-
-#define	LX_EXIT		1
-#define	LX_EXIT_GROUP	2
-
-/*
- * This is dicey.  This seems to be an internal glibc structure, and not
- * part of any external interface.  Thus, it is subject to change without
- * notice.  FWIW, clone(2) itself seems to be an internal (or at least
- * unstable) interface, since strace(1) shows it differently than the man
- * page.
- */
-struct lx_desc
-{
-	uint32_t entry_number;
-	uint32_t base_addr;
-	uint32_t limit;
-	uint32_t seg_32bit:1;
-	uint32_t contents:2;
-	uint32_t read_exec_only:1;
-	uint32_t limit_in_pages:1;
-	uint32_t seg_not_present:1;
-	uint32_t useable:1;
-	uint32_t empty:25;
-};
-
-struct clone_state {
-	void		*c_retaddr;	/* instr after clone()'s int80 */
-	int		c_flags;	/* flags to clone(2) */
-	int 		c_sig;		/* signal to send on thread exit */
-	void 		*c_stk;		/* %esp of new thread */
-	void 		*c_ptidp;
-	struct lx_desc	*c_ldtinfo;	/* thread-specific segment */
-	void		*c_ctidp;
-	uintptr_t	c_gs;		/* Linux's %gs */
-	sigset_t	c_sigmask;	/* signal mask */
-	lx_affmask_t	c_affmask;	/* CPU affinity mask */
-	volatile int	*c_clone_res;	/* pid/error returned to cloner */
-};
-
-extern void lx_setup_clone(uintptr_t, void *, void *);
-
-/*
- * Counter incremented when we vfork(2) ourselves, and decremented when the
- * vfork(2)ed child exit(2)s or exec(2)s.
- */
-static int is_vforked = 0;
-
-int
-lx_exit(uintptr_t p1)
-{
-	int		ret, status = (int)p1;
-	lx_tsd_t	*lx_tsd;
-
-	/*
-	 * If we are a vfork(2)ed child, we need to exit as quickly and
-	 * cleanly as possible to avoid corrupting our parent.
-	 */
-	if (is_vforked != 0) {
-		is_vforked--;
-		_exit(status);
-	}
-
-	if ((ret = thr_getspecific(lx_tsd_key, (void **)&lx_tsd)) != 0)
-		lx_err_fatal(gettext(
-		    "%s: unable to read thread-specific data: %s"),
-		    "exit", strerror(ret));
-
-	assert(lx_tsd != 0);
-
-	lx_tsd->lxtsd_exit = LX_EXIT;
-	lx_tsd->lxtsd_exit_status = status;
-
-	/*
-	 * Block all signals in the exit context to avoid taking any signals
-	 * (to the degree possible) while exiting.
-	 */
-	(void) sigfillset(&lx_tsd->lxtsd_exit_context.uc_sigmask);
-
-	/*
-	 * This thread is exiting.  Restore the state of the thread to
-	 * what it was before we started running linux code.
-	 */
-	(void) setcontext(&lx_tsd->lxtsd_exit_context);
-
-	/*
-	 * If we returned from the setcontext(2), something is very wrong.
-	 */
-	lx_err_fatal(gettext("%s: unable to set exit context: %s"),
-	    "exit", strerror(errno));
-
-	/*NOTREACHED*/
-	return (0);
-}
-
-int
-lx_group_exit(uintptr_t p1)
-{
-	int		ret, status = (int)p1;
-	lx_tsd_t	*lx_tsd;
-
-	/*
-	 * If we are a vfork(2)ed child, we need to exit as quickly and
-	 * cleanly as possible to avoid corrupting our parent.
-	 */
-	if (is_vforked != 0) {
-		is_vforked--;
-		_exit(status);
-	}
-
-	if ((ret = thr_getspecific(lx_tsd_key, (void **)&lx_tsd)) != 0)
-		lx_err_fatal(gettext(
-		    "%s: unable to read thread-specific data: %s"),
-		    "group_exit", strerror(ret));
-
-	assert(lx_tsd != 0);
-
-	lx_tsd->lxtsd_exit = LX_EXIT_GROUP;
-	lx_tsd->lxtsd_exit_status = status;
-
-	/*
-	 * Block all signals in the exit context to avoid taking any signals
-	 * (to the degree possible) while exiting.
-	 */
-	(void) sigfillset(&lx_tsd->lxtsd_exit_context.uc_sigmask);
-
-	/*
-	 * This thread is exiting.  Restore the state of the thread to
-	 * what it was before we started running linux code.
-	 */
-	(void) setcontext(&lx_tsd->lxtsd_exit_context);
-
-	/*
-	 * If we returned from the setcontext(2), something is very wrong.
-	 */
-	lx_err_fatal(gettext("%s: unable to set exit context: %s"),
-	    "group_exit", strerror(errno));
-
-	/*NOTREACHED*/
-	return (0);
-}
-
-static void *
-clone_start(void *arg)
-{
-	int rval;
-	struct clone_state *cs = (struct clone_state *)arg;
-	lx_tsd_t lx_tsd;
-
-	/*
-	 * Let the kernel finish setting up all the needed state for this
-	 * new thread.
-	 *
-	 * We already created the thread using the thr_create(3C) library
-	 * call, so most of the work required to emulate lx_clone(2) has
-	 * been done by the time we get to this point.  Instead of creating
-	 * a new brandsys(2) subcommand to perform the last few bits of
-	 * bookkeeping, we just use the lx_clone() slot in the syscall
-	 * table.
-	 */
-	lx_debug("\tre-vectoring to lx kernel module to complete lx_clone()");
-	lx_debug("\tLX_SYS_clone(0x%x, 0x%p, 0x%p, 0x%p, 0x%p)",
-	    cs->c_flags, cs->c_stk, cs->c_ptidp, cs->c_ldtinfo, cs->c_ctidp);
-
-	rval = syscall(SYS_brand, B_EMULATE_SYSCALL + LX_SYS_clone,
-	    cs->c_flags, cs->c_stk, cs->c_ptidp, cs->c_ldtinfo, cs->c_ctidp,
-	    NULL);
-
-	/*
-	 * At this point the parent is waiting for cs->c_clone_res to go
-	 * non-zero to indicate the thread has been cloned.  The value set
-	 * in cs->c_clone_res will be used for the return value from
-	 * clone().
-	 */
-	if (rval < 0) {
-		*(cs->c_clone_res) = -errno;
-		lx_debug("\tkernel clone failed, errno %d\n", errno);
-		return (NULL);
-	}
-
-	if (lx_sched_setaffinity(0, sizeof (cs->c_affmask),
-	    (uintptr_t)&cs->c_affmask) != 0) {
-		*(cs->c_clone_res) = -errno;
-
-		lx_err_fatal(gettext(
-		    "Unable to set affinity mask in child thread: %s"),
-		    strerror(errno));
-	}
-
-	/* Initialize the thread specific data for this thread. */
-	bzero(&lx_tsd, sizeof (lx_tsd));
-	lx_tsd.lxtsd_gs = cs->c_gs;
-
-	/*
-	 * Use the address of the stack-allocated lx_tsd as the
-	 * per-thread storage area to cache various values for later
-	 * use.
-	 *
-	 * This address is only used by this thread, so there is no
-	 * danger of other threads using this storage area, nor of it
-	 * being accessed once this stack frame has been freed.
-	 */
-	if (thr_setspecific(lx_tsd_key, &lx_tsd) != 0) {
-		*(cs->c_clone_res) = -errno;
-		lx_err_fatal(
-		    gettext("Unable to set thread-specific ptr for clone: %s"),
-		    strerror(rval));
-	}
-
-	/*
-	 * Save the current context of this thread.
-	 *
-	 * We'll restore this context when this thread attempts to exit.
-	 */
-	if (getcontext(&lx_tsd.lxtsd_exit_context) != 0) {
-		*(cs->c_clone_res) = -errno;
-
-		lx_err_fatal(gettext(
-		    "Unable to initialize thread-specific exit context: %s"),
-		    strerror(errno));
-	}
-
-	/*
-	 * Do the final stack twiddling, reset %gs, and return to the
-	 * clone(2) path.
-	 */
-	if (lx_tsd.lxtsd_exit == 0) {
-		if (sigprocmask(SIG_SETMASK, &cs->c_sigmask, NULL) < 0) {
-			*(cs->c_clone_res) = -errno;
-
-			lx_err_fatal(gettext(
-			    "Unable to release held signals for child "
-			    "thread: %s"), strerror(errno));
-		}
-
-		/*
-		 * Let the parent know that the clone has (effectively) been
-		 * completed.
-		 */
-		*(cs->c_clone_res) = rval;
-
-		lx_setup_clone(cs->c_gs, cs->c_retaddr, cs->c_stk);
-
-		/* lx_setup_clone() should never return. */
-		assert(0);
-	}
-
-	/*
-	 * We are here because the Linux application called the exit() or
-	 * exit_group() system call.  In turn the brand library did a
-	 * setcontext() to jump to the thread context state saved in
-	 * getcontext(), above.
-	 */
-	if (lx_tsd.lxtsd_exit == LX_EXIT)
-		thr_exit((void *)lx_tsd.lxtsd_exit_status);
-	else
-		exit(lx_tsd.lxtsd_exit_status);
-
-	assert(0);
-	/*NOTREACHED*/
-}
-
-int
-lx_clone(uintptr_t p1, uintptr_t p2, uintptr_t p3, uintptr_t p4,
-	uintptr_t p5)
-{
-	struct clone_state *cs;
-	int flags = (int)p1;
-	void *cldstk = (void *)p2;
-	void *ptidp = (void *)p3;
-	struct lx_desc *ldtinfo = (void *)p4;
-	void *ctidp = (void *)p5;
-	thread_t tid;
-	volatile int clone_res;
-	int sig;
-	int rval;
-	int pid;
-	lx_regs_t *rp;
-	sigset_t sigmask;
-
-	if (flags & LX_CLONE_SETTLS) {
-		lx_debug("lx_clone(flags=0x%x stk=0x%p ptidp=0x%p ldt=0x%p "
-		    "ctidp=0x%p", flags, cldstk, ptidp, ldtinfo, ctidp);
-	} else {
-		lx_debug("lx_clone(flags=0x%x stk=0x%p ptidp=0x%p)",
-		    flags, cldstk, ptidp);
-	}
-
-	/*
-	 * Only supported for pid 0 on Linux
-	 */
-	if (flags & LX_CLONE_PID)
-		return (-EINVAL);
-
-	/*
-	 * CLONE_THREAD requires CLONE_SIGHAND.
-	 *
-	 * CLONE_THREAD and CLONE_DETACHED must both be either set or cleared
-	 * in kernel 2.4 and prior.
-	 * In kernel 2.6 CLONE_DETACHED was dropped completely, so we no
-	 * longer have this requirement.
-	 */
-
-	if (flags & CLONE_TD) {
-		if (!(flags & LX_CLONE_SIGHAND))
-			return (-EINVAL);
-		if ((lx_get_kern_version() <= LX_KERN_2_4) &&
-		    (flags & CLONE_TD) != CLONE_TD)
-			return (-EINVAL);
-	}
-
-	rp = lx_syscall_regs();
-
-	/* test if pointer passed by user are writable */
-	if (flags & LX_CLONE_PARENT_SETTID) {
-		if (uucopy(ptidp, &pid, sizeof (int)) != 0)
-			return (-EFAULT);
-		if (uucopy(&pid, ptidp, sizeof (int)) != 0)
-			return (-EFAULT);
-	}
-	if (flags & LX_CLONE_CHILD_SETTID) {
-		if (uucopy(ctidp, &pid, sizeof (int)) != 0)
-			return (-EFAULT);
-		if (uucopy(&pid, ctidp, sizeof (int)) != 0)
-			return (-EFAULT);
-	}
-
-	/* See if this is a fork() operation or a thr_create().  */
-	if (IS_FORK(flags) || IS_VFORK(flags)) {
-		if (flags & LX_CLONE_PARENT) {
-			lx_unsupported(gettext(
-			    "clone(2) only supports CLONE_PARENT "
-			    "for threads.\n"));
-			return (-ENOTSUP);
-		}
-
-		if (flags & LX_CLONE_PTRACE)
-			lx_ptrace_fork();
-
-		if (flags & LX_CLONE_VFORK) {
-			is_vforked++;
-			rval = vfork();
-			if (rval != 0)
-				is_vforked--;
-		} else {
-			rval = fork1();
-			if (rval == 0 && lx_is_rpm)
-				(void) sleep(lx_rpm_delay);
-		}
-
-		/*
-		 * Since we've already forked, we can't do much if uucopy fails,
-		 * so we just ignore failure. Failure is unlikely since we've
-		 * tested the memory before we did the fork.
-		 */
-		if (rval > 0 && (flags & LX_CLONE_PARENT_SETTID)) {
-			(void) uucopy(&rval, ptidp, sizeof (int));
-		}
-
-		if (rval == 0 && (flags & LX_CLONE_CHILD_SETTID)) {
-			/*
-			 * lx_getpid should not fail, and if it does, there's
-			 * not much we can do about it since we've already
-			 * forked, so on failure, we just don't copy the
-			 * memory.
-			 */
-			pid = lx_getpid();
-			if (pid >= 0)
-				(void) uucopy(&pid, ctidp, sizeof (int));
-		}
-
-		/* Parent just returns */
-		if (rval != 0)
-			return ((rval < 0) ? -errno : rval);
-
-		/*
-		 * If provided, the child needs its new stack set up.
-		 */
-		if (cldstk)
-			lx_setup_clone(rp->lxr_gs, (void *)rp->lxr_eip, cldstk);
-
-		return (0);
-	}
-
-	/*
-	 * We have very restricted support.... only exactly these flags are
-	 * supported
-	 */
-	if (((flags & SHARED_AS) != SHARED_AS)) {
-		lx_unsupported(gettext(
-		    "clone(2) requires that all or none of CLONE_VM "
-		    "CLONE_FS, CLONE_FILES, and CLONE_SIGHAND be set.\n"));
-		return (-ENOTSUP);
-	}
-
-	if (cldstk == NULL) {
-		lx_unsupported(gettext(
-		    "clone(2) requires the caller to allocate the "
-		    "child's stack.\n"));
-		return (-ENOTSUP);
-	}
-
-	/*
-	 * If we want a signal-on-exit, ensure that the signal is valid.
-	 */
-	if ((sig = ltos_signo[flags & LX_CSIGNAL]) == -1) {
-		lx_unsupported(gettext(
-		    "clone(2) passed unsupported signal: %d"), sig);
-		return (-ENOTSUP);
-	}
-
-	/*
-	 * To avoid malloc() here, we steal a part of the new thread's
-	 * stack to store all the info that thread might need for
-	 * initialization.  We also make it 64-bit aligned for good
-	 * measure.
-	 */
-	cs = (struct clone_state *)
-	    ((p2 - sizeof (struct clone_state)) & -((uintptr_t)8));
-	cs->c_flags = flags;
-	cs->c_sig = sig;
-	cs->c_stk = cldstk;
-	cs->c_ptidp = ptidp;
-	cs->c_ldtinfo = ldtinfo;
-	cs->c_ctidp = ctidp;
-	cs->c_clone_res = &clone_res;
-	cs->c_gs = rp->lxr_gs;
-
-	if (lx_sched_getaffinity(0, sizeof (cs->c_affmask),
-	    (uintptr_t)&cs->c_affmask) == -1)
-		lx_err_fatal(gettext(
-		    "Unable to get affinity mask for parent thread: %s"),
-		    strerror(errno));
-
-	/*
-	 * We want the new thread to return directly to the return site for
-	 * the system call.
-	 */
-	cs->c_retaddr = (void *)rp->lxr_eip;
-	clone_res = 0;
-
-	(void) sigfillset(&sigmask);
-
-	/*
-	 * Block all signals because the thread we create won't be able to
-	 * properly handle them until it's fully set up.
-	 */
-	if (sigprocmask(SIG_BLOCK, &sigmask, &cs->c_sigmask) < 0) {
-		lx_debug("lx_clone sigprocmask() failed: %s", strerror(errno));
-		return (-errno);
-	}
-
-	rval = thr_create(NULL, NULL, clone_start, cs, THR_DETACHED, &tid);
-
-	/*
-	 * Release any pending signals
-	 */
-	(void) sigprocmask(SIG_SETMASK, &cs->c_sigmask, NULL);
-
-	/*
-	 * Wait for the child to be created and have its tid assigned.
-	 */
-	if (rval == 0) {
-		while (clone_res == 0)
-			;
-
-		rval = clone_res;
-	}
-
-	return (rval);
-}

--- a/usr/src/lib/brand/lx/lx_brand/common/debug.c	Fri Jun 11 14:34:29 2010 -0400
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,147 +0,0 @@
-/*
- * CDDL HEADER START
- *
- * The contents of this file are subject to the terms of the
- * Common Development and Distribution License (the "License").
- * You may not use this file except in compliance with the License.
- *
- * You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
- * or http://www.opensolaris.org/os/licensing.
- * See the License for the specific language governing permissions
- * and limitations under the License.
- *
- * When distributing Covered Code, include this CDDL HEADER in each
- * file and include the License file at usr/src/OPENSOLARIS.LICENSE.
- * If applicable, add the following below this CDDL HEADER, with the
- * fields enclosed by brackets "[]" replaced with your own identifying
- * information: Portions Copyright [yyyy] [name of copyright owner]
- *
- * CDDL HEADER END
- */
-/*
- * Copyright 2006 Sun Microsystems, Inc.  All rights reserved.
- * Use is subject to license terms.
- */
-
-#pragma ident	"%Z%%M%	%I%	%E% SMI"
-
-#include <assert.h>
-#include <errno.h>
-#include <fcntl.h>
-#include <stdarg.h>
-#include <stdio.h>
-#include <stdlib.h>
-#include <strings.h>
-#include <thread.h>
-#include <unistd.h>
-
-#include <sys/modctl.h>
-#include <sys/stat.h>
-#include <sys/types.h>
-
-#include <sys/lx_brand.h>
-#include <sys/lx_debug.h>
-#include <sys/lx_misc.h>
-
-/* internal debugging state */
-static char	*lx_debug_path = NULL;		/* debug output file path */
-static char	lx_debug_path_buf[MAXPATHLEN];
-
-void
-lx_debug_enable(void)
-{
-	/* send all debugging output to /dev/tty */
-	lx_debug_path = "/dev/tty";
-	lx_debug("lx_debug: debugging output enabled: %s", lx_debug_path);
-}
-
-void
-lx_debug_init(void)
-{
-	if (getenv("LX_DEBUG") == NULL)
-		return;
-
-	/*
-	 * It's OK to use this value without any locking, as all callers can
-	 * use the return value to decide whether extra work should be done
-	 * before calling lx_debug().
-	 *
-	 * If debugging is disabled after a routine calls this function it
-	 * doesn't really matter as lx_debug() will see debugging is disabled
-	 * and will not output anything.
-	 */
-	lx_debug_enabled = 1;
-
-	/* check if there's a debug log file specified */
-	lx_debug_path = getenv("LX_DEBUG_FILE");
-	if (lx_debug_path == NULL) {
-		/* send all debugging output to /dev/tty */
-		lx_debug_path = "/dev/tty";
-	}
-
-	(void) strlcpy(lx_debug_path_buf, lx_debug_path,
-	    sizeof (lx_debug_path_buf));
-	lx_debug_path = lx_debug_path_buf;
-
-	lx_debug("lx_debug: debugging output ENABLED to path: \"%s\"",
-	    lx_debug_path);
-}
-
-void
-lx_debug(const char *msg, ...)
-{
-	va_list		ap;
-	char		buf[LX_MSG_MAXLEN + 1];
-	int		rv, fd, n;
-	int		errno_backup;
-
-	if (lx_debug_enabled == 0)
-		return;
-
-	errno_backup = errno;
-
-	/* prefix the message with pid/tid */
-	if ((n = snprintf(buf, sizeof (buf), "%u/%u: ",
-	    getpid(), thr_self())) == -1) {
-		errno = errno_backup;
-		return;
-	}
-
-	/* format the message */
-	va_start(ap, msg);
-	rv = vsnprintf(&buf[n], sizeof (buf) - n, msg, ap);
-	va_end(ap);
-	if (rv == -1) {
-		errno = errno_backup;
-		return;
-	}
-
-	/* add a carrige return if there isn't one already */
-	if ((buf[strlen(buf) - 1] != '\n') &&
-	    (strlcat(buf, "\n", sizeof (buf)) >= sizeof (buf))) {
-		errno = errno_backup;
-		return;
-	}
-
-	/*
-	 * Open the debugging output file.  note that we don't protect
-	 * ourselves against exec or fork1 here.  if an mt process were
-	 * to exec/fork1 while we're doing this they'd end up with an
-	 * extra open desciptor in their fd space.  a'well.  shouldn't
-	 * really matter.
-	 */
-	if ((fd = open(lx_debug_path,
-	    O_WRONLY|O_APPEND|O_CREAT|O_NDELAY|O_NOCTTY, 0666)) == -1) {
-		return;
-	}
-	(void) fchmod(fd, 0666);
-
-	/* we retry in case of EINTR */
-	do {
-		rv = write(fd, buf, strlen(buf));
-	} while ((rv == -1) && (errno == EINTR));
-	(void) fsync(fd);
-
-	(void) close(fd);
-	errno = errno_backup;
-}

--- a/usr/src/lib/brand/lx/lx_brand/common/dir.c	Fri Jun 11 14:34:29 2010 -0400
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,160 +0,0 @@
-/*
- * CDDL HEADER START
- *
- * The contents of this file are subject to the terms of the
- * Common Development and Distribution License (the "License").
- * You may not use this file except in compliance with the License.
- *
- * You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
- * or http://www.opensolaris.org/os/licensing.
- * See the License for the specific language governing permissions
- * and limitations under the License.
- *
- * When distributing Covered Code, include this CDDL HEADER in each
- * file and include the License file at usr/src/OPENSOLARIS.LICENSE.
- * If applicable, add the following below this CDDL HEADER, with the
- * fields enclosed by brackets "[]" replaced with your own identifying
- * information: Portions Copyright [yyyy] [name of copyright owner]
- *
- * CDDL HEADER END
- */
-/*
- * Copyright 2006 Sun Microsystems, Inc.  All rights reserved.
- * Use is subject to license terms.
- */
-
-#pragma ident	"%Z%%M%	%I%	%E% SMI"
-
-#include <string.h>
-#include <stddef.h>
-#include <errno.h>
-#include <unistd.h>
-#include <assert.h>
-#include <sys/types.h>
-#include <sys/systm.h>
-#include <sys/dirent.h>
-#include <sys/lx_misc.h>
-#include <sys/lx_debug.h>
-
-#define	LX_NAMEMAX	256
-
-struct lx_dirent {
-	long		d_ino;  /* not l_ino_t */
-	long		d_off;
-	ushort_t	d_reclen;
-	char 		d_name[LX_NAMEMAX];
-};
-
-struct lx_dirent64 {
-	uint64_t	d_ino;
-	int64_t		d_off;
-	ushort_t	d_reclen;
-	uchar_t		d_type;
-	char		d_name[LX_NAMEMAX];
-};
-
-#define	LX_RECLEN(namelen)	\
-	((offsetof(struct lx_dirent64, d_name) + 1 + (namelen) + 7) & ~7)
-
-/*
- * Read in one dirent structure from fd into dirp.
- * p3 (count) is ignored.
- */
-/*ARGSUSED*/
-int
-lx_readdir(uintptr_t p1, uintptr_t p2, uintptr_t p3)
-{
-	int fd = (int)p1;
-	struct lx_dirent *dirp = (struct lx_dirent *)p2;
-	uint_t count = sizeof (struct lx_dirent);
-	int rc = 0;
-	struct lx_dirent _ld;
-	struct dirent *sd = (struct dirent *)&_ld;
-
-	/*
-	 * The return value from getdents is not applicable, as
-	 * it might have squeezed more than one dirent in the buffer
-	 * we provided.
-	 *
-	 * getdents() will deal with the case of dirp == NULL
-	 */
-	if ((rc = getdents(fd, sd, count)) < 0)
-		return (-errno);
-
-	/*
-	 * Set rc 1 (pass), or 0 (end of directory).
-	 */
-	rc = (sd->d_reclen == 0) ? 0 : 1;
-
-	if (uucopy(sd, dirp, count) != 0)
-		return (-errno);
-
-	return (rc);
-}
-
-/*
- * Read in dirent64 structures from p1 (fd) into p2 (buffer).
- * p3 (count) is the size of the memory area.
- */
-int
-lx_getdents64(uintptr_t p1, uintptr_t p2, uintptr_t p3)
-{
-	int fd = (uint_t)p1;
-	void *buf = (void *)p2;
-	void *sbuf, *lbuf;
-	int lbufsz = (uint_t)p3;
-	int sbufsz;
-	int namelen;
-	struct dirent *sd;
-	struct lx_dirent64 *ld;
-	int bytes, rc;
-
-	if (lbufsz < sizeof (struct lx_dirent64))
-		return (-EINVAL);
-
-	/*
-	 * The Linux dirent64 is bigger than the Solaris dirent64.  To
-	 * avoid inadvertently consuming more of the directory than we can
-	 * pass back to the Linux app, we hand the kernel a smaller buffer
-	 * than the app handed us.
-	 */
-	sbufsz = (lbufsz / 32) * 24;
-
-	sbuf = SAFE_ALLOCA(sbufsz);
-	lbuf = SAFE_ALLOCA(lbufsz);
-	if (sbuf == NULL || lbuf == NULL)
-		return (-ENOMEM);
-
-	if ((bytes = getdents(fd, sbuf, sbufsz)) < 0)
-		return (-errno);
-
-	/* munge the Solaris buffer to a linux buffer. */
-	sd = (struct dirent *)sbuf;
-	ld = (struct lx_dirent64 *)lbuf;
-	rc = 0;
-	while (bytes > 0) {
-		namelen = strlen(sd->d_name);
-		if (namelen >= LX_NAMEMAX)
-			namelen = LX_NAMEMAX - 1;
-		ld->d_ino = (uint64_t)sd->d_ino;
-		ld->d_off = (int64_t)sd->d_off;
-		ld->d_type = 0;
-
-		(void) strncpy(ld->d_name, sd->d_name, namelen);
-		ld->d_name[namelen] = 0;
-		ld->d_reclen = (ushort_t)LX_RECLEN(namelen);
-
-		bytes -= (int)sd->d_reclen;
-		rc += (int)ld->d_reclen;
-
-		sd = (struct dirent *)(void *)((caddr_t)sd + sd->d_reclen);
-		ld = (struct lx_dirent64 *)(void *)((caddr_t)ld + ld->d_reclen);
-	}
-
-	/* now copy the lbuf to the userland buffer */
-	assert(rc <= lbufsz);
-	if (uucopy(lbuf, buf, rc) != 0)
-		return (-EFAULT);
-
-	return (rc);
-}

--- a/usr/src/lib/brand/lx/lx_brand/common/fcntl.c	Fri Jun 11 14:34:29 2010 -0400
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,387 +0,0 @@
-/*
- * CDDL HEADER START
- *
- * The contents of this file are subject to the terms of the
- * Common Development and Distribution License (the "License").
- * You may not use this file except in compliance with the License.
- *
- * You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
- * or http://www.opensolaris.org/os/licensing.
- * See the License for the specific language governing permissions
- * and limitations under the License.
- *
- * When distributing Covered Code, include this CDDL HEADER in each
- * file and include the License file at usr/src/OPENSOLARIS.LICENSE.
- * If applicable, add the following below this CDDL HEADER, with the
- * fields enclosed by brackets "[]" replaced with your own identifying
- * information: Portions Copyright [yyyy] [name of copyright owner]
- *
- * CDDL HEADER END
- */
-
-/*
- * Copyright 2007 Sun Microsystems, Inc.  All rights reserved.
- * Use is subject to license terms.
- */
-
-
-#pragma ident	"%Z%%M%	%I%	%E% SMI"
-
-#include <sys/types.h>
-#include <sys/filio.h>
-#include <unistd.h>
-#include <fcntl.h>
-#include <stropts.h>
-#include <libintl.h>
-#include <errno.h>
-#include <string.h>
-
-#include <sys/lx_fcntl.h>
-#include <sys/lx_debug.h>
-#include <sys/lx_misc.h>
-
-static int lx_fcntl_com(int fd, int cmd, ulong_t arg);
-static void ltos_flock(struct lx_flock *l, struct flock *s);
-static void stol_flock(struct flock *s, struct lx_flock *l);
-static void ltos_flock64(struct lx_flock64 *l, struct flock64 *s);
-static void stol_flock64(struct flock64 *s, struct lx_flock64 *l);
-static short ltos_type(short l_type);
-static short stol_type(short l_type);
-static int lx_fcntl_getfl(int fd);
-static int lx_fcntl_setfl(int fd, ulong_t arg);
-
-int
-lx_dup2(uintptr_t p1, uintptr_t p2)
-{
-	int oldfd = (int)p1;
-	int newfd = (int)p2;
-	int rc;
-
-	rc = fcntl(oldfd, F_DUP2FD, newfd);
-	return ((rc == -1) ? -errno : rc);
-}
-
-int
-lx_fcntl(uintptr_t p1, uintptr_t p2, uintptr_t p3)
-{
-	int		fd = (int)p1;
-	int		cmd = (int)p2;
-	ulong_t		arg = (ulong_t)p3;
-	struct lx_flock lxflk;
-	struct flock	fl;
-	int		lk = 0;
-	int		rc;
-
-	/*
-	 * The 64-bit fcntl commands must go through fcntl64().
-	 */
-	if (cmd == LX_F_GETLK64 || cmd == LX_F_SETLK64 ||
-	    cmd == LX_F_SETLKW64)
-		return (-EINVAL);
-
-	if (cmd == LX_F_SETSIG || cmd == LX_F_GETSIG || cmd == LX_F_SETLEASE ||
-	    cmd == LX_F_GETLEASE) {
-		lx_unsupported(gettext("%s(): unsupported command: %d"),
-		    "fcntl", cmd);
-		return (-ENOTSUP);
-	}
-
-	if (cmd == LX_F_GETLK || cmd == LX_F_SETLK ||
-	    cmd == LX_F_SETLKW) {
-		if (uucopy((void *)p3, (void *)&lxflk,
-		    sizeof (struct lx_flock)) != 0)
-			return (-errno);
-		lk = 1;
-		ltos_flock(&lxflk, &fl);
-		arg = (ulong_t)&fl;
-	}
-
-	rc = lx_fcntl_com(fd, cmd, arg);
-
-	if (lk)
-		stol_flock(&fl, (struct lx_flock *)p3);
-
-	return (rc);
-}
-
-int
-lx_fcntl64(uintptr_t p1, uintptr_t p2, uintptr_t p3)
-{
-	int		fd = (int)p1;
-	int		cmd = (int)p2;
-	struct lx_flock lxflk;
-	struct lx_flock64 lxflk64;
-	struct flock	fl;
-	struct flock64	fl64;
-	int		rc;
-
-	if (cmd == LX_F_SETSIG || cmd == LX_F_GETSIG || cmd == LX_F_SETLEASE ||
-	    cmd == LX_F_GETLEASE) {
-		lx_unsupported(gettext("%s(): unsupported command: %d"),
-		    "fcntl64", cmd);
-		return (-ENOTSUP);
-	}
-
-	if (cmd == LX_F_GETLK || cmd == LX_F_SETLK || cmd == LX_F_SETLKW) {
-		if (uucopy((void *)p3, (void *)&lxflk,
-		    sizeof (struct lx_flock)) != 0)
-			return (-errno);
-		ltos_flock(&lxflk, &fl);
-		rc = lx_fcntl_com(fd, cmd, (ulong_t)&fl);
-		stol_flock(&fl, (struct lx_flock *)p3);
-	} else if (cmd == LX_F_GETLK64 || cmd == LX_F_SETLKW64 || \
-	    cmd == LX_F_SETLK64) {
-		if (uucopy((void *)p3, (void *)&lxflk64,
-		    sizeof (struct lx_flock64)) != 0)
-			return (-errno);
-		ltos_flock64(&lxflk64, &fl64);
-		rc = lx_fcntl_com(fd, cmd, (ulong_t)&fl64);
-		stol_flock64(&fl64, (struct lx_flock64 *)p3);
-	} else {
-		rc = lx_fcntl_com(fd, cmd, (ulong_t)p3);
-	}
-
-	return (rc);
-}
-
-static int
-lx_fcntl_com(int fd, int cmd, ulong_t arg)
-{
-	int		rc = 0;
-
-	switch (cmd) {
-	case LX_F_DUPFD:
-		rc = fcntl(fd, F_DUPFD, arg);
-		break;
-
-	case LX_F_GETFD:
-		rc = fcntl(fd, F_GETFD, 0);
-		break;
-
-	case LX_F_SETFD:
-		rc = fcntl(fd, F_SETFD, arg);
-		break;
-
-	case LX_F_GETFL:
-		rc = lx_fcntl_getfl(fd);
-		break;
-
-	case LX_F_SETFL:
-		rc = lx_fcntl_setfl(fd, arg);
-		break;
-
-	case LX_F_GETLK:
-		rc = fcntl(fd, F_GETLK, arg);
-		break;
-
-	case LX_F_SETLK:
-		rc = fcntl(fd, F_SETLK, arg);
-		break;
-
-	case LX_F_SETLKW:
-		rc = fcntl(fd, F_SETLKW, arg);
-		break;
-
-	case LX_F_GETLK64:
-		rc = fcntl(fd, F_GETLK64, arg);
-		break;
-
-	case LX_F_SETLK64:
-		rc = fcntl(fd, F_SETLK64, arg);
-		break;
-
-	case LX_F_SETLKW64:
-		rc = fcntl(fd, F_SETLKW64, arg);
-		break;
-
-	case LX_F_SETOWN:
-		rc = fcntl(fd, F_SETOWN, arg);
-		break;
-
-	case LX_F_GETOWN:
-		rc = fcntl(fd, F_GETOWN, arg);
-		break;
-
-	default:
-		return (-EINVAL);
-	}
-
-	return ((rc == -1) ? -errno : rc);
-}
-
-
-#define	LTOS_FLOCK(l, s)						\
-{									\
-	s->l_type = ltos_type(l->l_type);				\
-	s->l_whence = l->l_whence;					\
-	s->l_start = l->l_start;					\
-	s->l_len = l->l_len;						\
-	s->l_sysid = 0;			/* not defined in linux */	\
-	s->l_pid = (pid_t)l->l_pid;					\
-}
-
-#define	STOL_FLOCK(s, l)						\
-{									\
-	l->l_type = stol_type(s->l_type);				\
-	l->l_whence = s->l_whence;					\
-	l->l_start = s->l_start;					\
-	l->l_len = s->l_len;						\
-	l->l_pid = (int)s->l_pid;					\
-}
-
-static void
-ltos_flock(struct lx_flock *l, struct flock *s)
-{
-	LTOS_FLOCK(l, s)
-}
-
-static void
-stol_flock(struct flock *s, struct lx_flock *l)
-{
-	STOL_FLOCK(s, l)
-}
-
-static void
-ltos_flock64(struct lx_flock64 *l, struct flock64 *s)
-{
-	LTOS_FLOCK(l, s)
-}
-
-static void
-stol_flock64(struct flock64 *s, struct lx_flock64 *l)
-{
-	STOL_FLOCK(s, l)
-}
-
-static short
-ltos_type(short l_type)
-{
-	switch (l_type) {
-	case LX_F_RDLCK:
-		return (F_RDLCK);
-	case LX_F_WRLCK:
-		return (F_WRLCK);
-	case LX_F_UNLCK:
-		return (F_UNLCK);
-	default:
-		return (-1);
-	}
-}
-
-static short
-stol_type(short l_type)
-{
-	switch (l_type) {
-	case F_RDLCK:
-		return (LX_F_RDLCK);
-	case F_WRLCK:
-		return (LX_F_WRLCK);
-	case F_UNLCK:
-		return (LX_F_UNLCK);
-	default:
-		/* can't ever happen */
-		return (0);
-	}
-}
-
-int
-lx_fcntl_getfl(int fd)
-{
-	int retval;
-	int rc;
-
-	retval = fcntl(fd, F_GETFL, 0);
-
-	if ((retval & O_ACCMODE) == O_RDONLY)
-		rc = LX_O_RDONLY;
-	else if ((retval & O_ACCMODE) == O_WRONLY)
-		rc = LX_O_WRONLY;
-	else
-		rc = LX_O_RDWR;
-	/* O_NDELAY != O_NONBLOCK, so we need to check for both */
-	if (retval & O_NDELAY)
-		rc |= LX_O_NDELAY;
-	if (retval & O_NONBLOCK)
-		rc |= LX_O_NONBLOCK;
-	if (retval & O_APPEND)
-		rc |= LX_O_APPEND;
-	if (retval & O_SYNC)
-		rc |= LX_O_SYNC;
-	if (retval & O_LARGEFILE)
-		rc |= LX_O_LARGEFILE;
-	if (retval & FASYNC)
-		rc |= LX_O_ASYNC;
-
-	return (rc);
-}
-
-int
-lx_fcntl_setfl(int fd, ulong_t arg)
-{
-	int new_arg;
-
-	new_arg = 0;
-	/* LX_O_NDELAY == LX_O_NONBLOCK, so we only check for one */
-	if (arg & LX_O_NDELAY)
-		new_arg |= O_NONBLOCK;
-	if (arg & LX_O_APPEND)
-		new_arg |= O_APPEND;
-	if (arg & LX_O_SYNC)
-		new_arg |= O_SYNC;
-	if (arg & LX_O_LARGEFILE)
-		new_arg |= O_LARGEFILE;
-	if (arg & LX_O_ASYNC)
-		new_arg |= FASYNC;
-
-	return ((fcntl(fd, F_SETFL, new_arg) == 0) ? 0 : -errno);
-}
-
-/*
- * flock() applies or removes an advisory lock on the file
- * associated with the file descriptor fd.
- *
- * Stolen verbatim from usr/src/ucblib/libucb/port/sys/flock.c
- *
- * operation is: LX_LOCK_SH, LX_LOCK_EX, LX_LOCK_UN, LX_LOCK_NB
- */
-int
-lx_flock(uintptr_t p1, uintptr_t p2)
-{
-	int			fd = (int)p1;
-	int			operation = (int)p2;
-	struct flock		fl;
-	int			cmd;
-	int			ret;
-
-	/* In non-blocking lock, use F_SETLK for cmd, F_SETLKW otherwise */
-	if (operation & LX_LOCK_NB) {
-		cmd = F_SETLK;
-		operation &= ~LX_LOCK_NB; /* turn off this bit */
-	} else
-		cmd = F_SETLKW;
-
-	switch (operation) {
-		case LX_LOCK_UN:
-			fl.l_type = F_UNLCK;
-			break;
-		case LX_LOCK_SH:
-			fl.l_type = F_RDLCK;
-			break;
-		case LX_LOCK_EX:
-			fl.l_type = F_WRLCK;
-			break;
-		default:
-			return (-EINVAL);
-	}
-
-	fl.l_whence = 0;
-	fl.l_start = 0;
-	fl.l_len = 0;
-
-	ret = fcntl(fd, cmd, &fl);
-
-	if (ret == -1 && errno == EACCES)
-		return (-EWOULDBLOCK);
-
-	return ((ret == -1) ? -errno : ret);
-}