--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/deleted_files/usr/src/cmd/sgs/libelf/spec/Makefile	Tue Mar 14 09:22:52 2006 -0800
@@ -0,0 +1,32 @@
+#
+# CDDL HEADER START
+#
+# The contents of this file are subject to the terms of the
+# Common Development and Distribution License, Version 1.0 only
+# (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 (c) 1997-1999 by Sun Microsystems, Inc.
+# All rights reserved.
+#
+#ident	"%Z%%M%	%I%	%E% SMI"
+#
+# cmd/sgs/libelf/spec/Makefile
+
+include	$(SRC)/lib/Makefile.spec.arch
+
+chkmsg:

--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/deleted_files/usr/src/cmd/sgs/libelf/spec/Makefile.targ	Tue Mar 14 09:22:52 2006 -0800
@@ -0,0 +1,40 @@
+#
+# CDDL HEADER START
+#
+# The contents of this file are subject to the terms of the
+# Common Development and Distribution License, Version 1.0 only
+# (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
+#
+#ident	"%Z%%M%	%I%	%E% SMI"
+#
+# Copyright (c) 1997-1999 by Sun Microsystems, Inc.
+# All rights reserved.
+#
+# cmd/sgs/libelf/Makefile.targ
+
+LIBRARY	=	libelf.a
+VERS	=	.1
+
+OBJECTS	=	elf.o	\
+		elf32.o	\
+		elf64.o	\
+		gelf.o	\
+		weak.o
+
+SPECCPP =
+
+lint:

--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/deleted_files/usr/src/cmd/sgs/libelf/spec/amd64/Makefile	Tue Mar 14 09:22:52 2006 -0800
@@ -0,0 +1,45 @@
+#
+# CDDL HEADER START
+#
+# The contents of this file are subject to the terms of the
+# Common Development and Distribution License, Version 1.0 only
+# (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 2004 Sun Microsystems, Inc.  All rights reserved.
+# Use is subject to license terms.
+#
+# ident	"%Z%%M%	%I%	%E% SMI"
+#
+
+.KEEP_STATE:
+
+include	../Makefile.targ
+
+# Add arch specific objects here
+OBJECTS	+=
+
+include	$(SRC)/lib/Makefile.lib
+include	$(SRC)/lib/Makefile.lib.64
+
+# Uncomment the following if the linker complains
+#amd64_C_PICFLAGS  = -K PIC
+
+include	$(SRC)/lib/Makefile.spec
+ABILLIBC=
+
+install: $(ROOTABILIB64)

--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/deleted_files/usr/src/cmd/sgs/libelf/spec/elf.spec	Tue Mar 14 09:22:52 2006 -0800
@@ -0,0 +1,287 @@
+#
+# Copyright 2005 Sun Microsystems, Inc.  All rights reserved.
+# Use is subject to license terms.
+#
+# CDDL HEADER START
+#
+# The contents of this file are subject to the terms of the
+# Common Development and Distribution License, Version 1.0 only
+# (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
+#
+#pragma ident	"%Z%%M%	%I%	%E% SMI"
+#
+# cmd/sgs/libelf/spec/elf.spec
+
+
+function	elf_getphnum
+include		<libelf.h>
+declaration	int elf_getphnum(Elf *elf, size_t *phnum)
+version		SUNW_1.6
+end		
+
+function	elf_getshnum
+include		<libelf.h>
+declaration	int elf_getshnum(Elf *elf, size_t *shnum)
+version		SUNW_1.4
+end		
+
+function	elf_getshstrndx
+include		<libelf.h>
+declaration	int elf_getshstrndx(Elf *elf, size_t *shstrndx)
+version		SUNW_1.4
+end		
+
+function	elf_begin
+include		<libelf.h>
+declaration	Elf *elf_begin(int fildes, Elf_Cmd cmd, Elf *ref)
+version		SUNW_0.7
+exception	$return == NULL
+end
+
+function	elf_end
+include		<libelf.h>
+declaration	int elf_end(Elf *elf)
+version		SUNW_0.7
+exception	$return == 0
+end
+
+function	elf_memory
+include		<libelf.h>
+declaration	Elf *elf_memory(char *image, size_t sz)
+version		SUNW_0.7
+exception	$return == NULL
+end
+
+function	elf_next
+include		<libelf.h>
+declaration	Elf_Cmd elf_next(Elf *elf)
+version		SUNW_0.7
+exception	$return == ELF_C_NULL
+end
+
+function	elf_rand
+include		<libelf.h>
+declaration	size_t elf_rand(Elf *elf, size_t offset)
+version		SUNW_0.7
+exception	$return == 0
+end
+
+function	elf_cntl
+include		<libelf.h>
+declaration	int elf_cntl(Elf *elf, Elf_Cmd cmd)
+version		SUNW_0.7
+exception	$return == -1
+end
+
+function	elf_errmsg
+include		<libelf.h>
+declaration	const char *elf_errmsg (int err)
+version		SUNW_0.7
+exception	$return == NULL
+end
+
+function	elf_errno
+include		<libelf.h>
+declaration	int elf_errno(void)
+version		SUNW_0.7
+end
+
+function	elf_fill
+include		<libelf.h>
+declaration	void elf_fill(int fill)
+version		SUNW_0.7
+end
+
+function	elf_flagdata
+include		<libelf.h>
+declaration	unsigned elf_flagdata(Elf_Data *data, Elf_Cmd cmd, \
+			unsigned flags)
+version		SUNW_0.7
+exception	$return == 0
+end
+
+function	elf_flagehdr
+include		<libelf.h>
+declaration	unsigned elf_flagehdr(Elf *elf,	Elf_Cmd cmd, unsigned flags)
+version		SUNW_0.7
+exception	$return == 0
+end
+
+function	elf_flagelf
+include		<libelf.h>
+declaration	unsigned elf_flagelf(Elf *elf, Elf_Cmd cmd, unsigned flags)
+version		SUNW_0.7
+exception	$return == 0
+end
+
+function	elf_flagphdr
+include		<libelf.h>
+declaration	unsigned elf_flagphdr(Elf *elf,	Elf_Cmd	cmd, unsigned flags)
+version		SUNW_0.7
+exception	$return == 0
+end
+
+function	elf_flagscn
+include		<libelf.h>
+declaration	unsigned elf_flagscn(Elf_Scn *scn, Elf_Cmd cmd, unsigned flags)
+version		SUNW_0.7
+exception	$return == 0
+end
+
+function	elf_flagshdr
+include		<libelf.h>
+declaration	unsigned elf_flagshdr(Elf_Scn *scn, Elf_Cmd cmd, unsigned flags)
+version		SUNW_0.7
+exception	$return == 0
+end
+
+function	elf_getarhdr
+include		<libelf.h>
+declaration	Elf_Arhdr *elf_getarhdr(Elf *elf)
+version		SUNW_0.7
+exception	$return == NULL
+end
+
+function	elf_getarsym
+include		<libelf.h>
+declaration	Elf_Arsym *elf_getarsym(Elf *elf, size_t *ptr)
+version		SUNW_0.7
+exception	$return == NULL
+end
+
+function	elf_getbase
+include		<libelf.h>
+declaration	off_t elf_getbase(Elf *elf)
+version		SUNW_0.7
+exception	$return == -1
+end
+
+function	elf_getdata
+include		<libelf.h>
+declaration	Elf_Data *elf_getdata(Elf_Scn *scn, Elf_Data *data)
+version		SUNW_0.7
+exception	$return == NULL
+end
+
+function	elf_newdata
+include		<libelf.h>
+declaration	Elf_Data *elf_newdata(Elf_Scn *scn)
+version		SUNW_0.7
+exception	$return == NULL
+end
+
+function	elf_rawdata
+include		<libelf.h>
+declaration	Elf_Data *elf_rawdata(Elf_Scn *scn, Elf_Data *data)
+version		SUNW_0.7
+exception	$return == NULL
+end
+
+function	elf_getident
+include		<libelf.h>
+declaration	char *elf_getident(Elf *elf, size_t *ptr)
+version		SUNW_0.7
+exception	$return == NULL
+end
+
+function	elf_getscn
+include		<libelf.h>
+declaration	Elf_Scn *elf_getscn(Elf *elf, size_t index)
+version		SUNW_0.7
+exception	$return == NULL
+end
+
+function	elf_ndxscn
+include		<libelf.h>
+declaration	size_t elf_ndxscn(Elf_Scn *scn)
+version		SUNW_0.7
+exception	$return == SHN_UNDEF
+end
+
+function	elf_newscn
+include		<libelf.h>
+declaration	Elf_Scn *elf_newscn(Elf *elf)
+version		SUNW_0.7
+exception	$return == NULL
+end
+
+function	elf_nextscn
+include		<libelf.h>
+declaration	Elf_Scn *elf_nextscn(Elf *elf, Elf_Scn *scn)
+version		SUNW_0.7
+exception	$return == NULL
+end
+
+function	elf_hash
+include		<libelf.h>
+declaration	unsigned long elf_hash(const char *name)
+version		SUNW_0.7
+end
+
+function	elf_kind
+include		<libelf.h>
+declaration	Elf_Kind elf_kind(Elf *elf)
+version		SUNW_0.7
+exception	$return == ELF_K_NONE
+end
+
+function	elf_rawfile
+include		<libelf.h>
+declaration	char *elf_rawfile(Elf *elf, size_t *ptr)
+version		SUNW_0.7
+exception	$return == NULL
+end
+
+function	elf_strptr
+include		<libelf.h>
+declaration	char *elf_strptr(Elf *elf, size_t section, size_t offset)
+version		SUNW_0.7
+exception	$return == NULL
+end
+
+function	elf_update
+include		<libelf.h>
+declaration	off_t elf_update(Elf *elf, Elf_Cmd cmd)
+version		SUNW_0.7
+exception	$return == -1
+end
+
+function	elf_version
+include		<libelf.h>
+declaration	unsigned elf_version(unsigned ver)
+version		SUNW_0.7
+end
+
+function	nlist
+include		<nlist.h>
+declaration	int nlist(const char *filename, struct nlist *nl)
+version		SUNW_0.7
+exception	$return == -1
+end
+
+function	_elf_getxoff
+version		SUNWprivate_1.1
+end
+
+function	_elf_outsync
+version		SUNWprivate_1.1
+end
+
+function	elf_demangle
+arch		sparc i386
+version		SUNWprivate_1.1
+end

--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/deleted_files/usr/src/cmd/sgs/libelf/spec/elf32.spec	Tue Mar 14 09:22:52 2006 -0800
@@ -0,0 +1,93 @@
+#
+# Copyright 2005 Sun Microsystems, Inc.  All rights reserved.
+# Use is subject to license terms.
+#
+# CDDL HEADER START
+#
+# The contents of this file are subject to the terms of the
+# Common Development and Distribution License, Version 1.0 only
+# (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
+#
+#pragma ident	"%Z%%M%	%I%	%E% SMI"
+#
+# cmd/sgs/libelf/spec/elf32.spec
+
+function	elf32_checksum
+include		<libelf.h>
+declaration	long elf32_checksum(Elf *elf)
+version		SUNW_1.3
+exception	$return == 0
+end		
+
+function	elf32_fsize
+include		<libelf.h>
+declaration	size_t elf32_fsize(Elf_Type type, size_t count, unsigned ver)
+version		SUNW_0.7
+exception	$return == 0
+end		
+
+function	elf32_getphdr
+include		<libelf.h>
+declaration	Elf32_Phdr *elf32_getphdr(Elf *elf)
+version		SUNW_0.7
+exception	$return == NULL
+end		
+
+function	elf32_newphdr
+include		<libelf.h>
+declaration	Elf32_Phdr *elf32_newphdr(Elf *elf, size_t count)
+version		SUNW_0.7
+exception	$return == NULL
+end		
+
+function	elf32_getshdr
+include		<libelf.h>
+declaration	Elf32_Shdr *elf32_getshdr(Elf_Scn *scn)
+version		SUNW_0.7
+exception	$return == NULL
+end		
+
+function	elf32_getehdr
+include		<libelf.h>
+declaration	Elf32_Ehdr *elf32_getehdr(Elf *elf)
+version		SUNW_0.7
+exception	$return == NULL
+end		
+
+function	elf32_newehdr
+include		<libelf.h>
+declaration	Elf32_Ehdr *elf32_newehdr(Elf *elf)
+version		SUNW_0.7
+exception	$return == NULL
+end		
+
+function	elf32_xlatetof
+include		<libelf.h>
+declaration	Elf_Data *elf32_xlatetof(Elf_Data *dst, const Elf_Data *src,\
+			unsigned encode)
+version		SUNW_0.7
+exception	$return == NULL
+end		
+
+function	elf32_xlatetom
+include		<libelf.h>
+declaration	Elf_Data *elf32_xlatetom(Elf_Data *dst, const Elf_Data *src, \
+			unsigned encode)
+version		SUNW_0.7
+exception	$return == NULL
+end		
+

--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/deleted_files/usr/src/cmd/sgs/libelf/spec/elf64.spec	Tue Mar 14 09:22:52 2006 -0800
@@ -0,0 +1,93 @@
+#
+# Copyright 2005 Sun Microsystems, Inc.  All rights reserved.
+# Use is subject to license terms.
+#
+# CDDL HEADER START
+#
+# The contents of this file are subject to the terms of the
+# Common Development and Distribution License, Version 1.0 only
+# (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
+#
+#pragma ident	"%Z%%M%	%I%	%E% SMI"
+#
+# cmd/sgs/libelf/spec/elf64.spec
+
+function	elf64_checksum
+include		<libelf.h>
+declaration	long elf64_checksum(Elf *elf)
+version		SUNW_1.3
+exception	$return == 0
+end		
+
+function	elf64_fsize
+include		<libelf.h>
+declaration	size_t elf64_fsize(Elf_Type type, size_t count, unsigned ver)
+version		SUNW_1.2
+exception	$return == 0
+end		
+
+function	elf64_getehdr
+include		<libelf.h>
+declaration	Elf64_Ehdr *elf64_getehdr(Elf *elf)
+version		SUNW_1.2
+exception	$return == NULL
+end		
+
+function	elf64_getphdr
+include		<libelf.h>
+declaration	Elf64_Phdr *elf64_getphdr(Elf *elf)
+version		SUNW_1.2
+exception	$return == NULL
+end		
+
+function	elf64_getshdr
+include		<libelf.h>
+declaration	Elf64_Shdr *elf64_getshdr(Elf_Scn *scn)
+version		SUNW_1.2
+exception	$return == NULL
+end		
+
+function	elf64_newehdr
+include		<libelf.h>
+declaration	Elf64_Ehdr *elf64_newehdr(Elf *elf)
+version		SUNW_1.2
+exception	$return == NULL
+end		
+
+function	elf64_newphdr
+include		<libelf.h>
+declaration	Elf64_Phdr *elf64_newphdr(Elf *elf, size_t count)
+version		SUNW_1.2
+exception	$return == NULL
+end		
+
+function	elf64_xlatetof
+include		<libelf.h>
+declaration	Elf_Data *elf64_xlatetof(Elf_Data *dst, const Elf_Data *src,\
+			unsigned encode)
+version		SUNW_1.2
+exception	$return == NULL
+end		
+
+function	elf64_xlatetom
+include		<libelf.h>
+declaration	Elf_Data *elf64_xlatetom(Elf_Data *dst, const Elf_Data *src, \
+			unsigned encode)
+version		SUNW_1.2
+exception	$return == NULL
+end		
+

--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/deleted_files/usr/src/cmd/sgs/libelf/spec/gelf.spec	Tue Mar 14 09:22:52 2006 -0800
@@ -0,0 +1,208 @@
+#
+# Copyright 2005 Sun Microsystems, Inc.  All rights reserved.
+# Use is subject to license terms.
+#
+# CDDL HEADER START
+#
+# The contents of this file are subject to the terms of the
+# Common Development and Distribution License, Version 1.0 only
+# (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
+#
+# ident	"%Z%%M%	%I%	%E% SMI"
+#
+# cmd/sgs/libelf/spec/gelf.spec
+
+function	gelf_getsymshndx
+include		<gelf.h>
+declaration	GElf_Sym *gelf_getsymshndx(Elf_Data *symdata, \
+			Elf_Data *shndxdata, int ndx, \
+			GElf_Sym *symptr, Elf32_Word *xshndx);
+version		SUNW_1.4
+end		
+
+function	gelf_update_symshndx
+include		<gelf.h>
+declaration	int gelf_update_symshndx(Elf_Data *symdata, \
+			Elf_Data *shndxdata, int ndx, \
+			GElf_Sym *symptr, Elf32_Word xshndx);
+version		SUNW_1.4
+end		
+
+function	gelf_checksum
+include		<gelf.h>
+declaration	long gelf_checksum(Elf *elf)
+version		SUNW_1.3
+end		
+
+function	gelf_getclass
+include		<gelf.h>
+declaration	int gelf_getclass(Elf *elf)
+version		SUNW_1.2
+end		
+
+function	gelf_fsize
+include		<gelf.h>
+declaration	size_t gelf_fsize(Elf *elf, Elf_Type type, size_t count, unsigned ver)
+version		SUNW_1.2
+end		
+
+function	gelf_getehdr
+include		<gelf.h>
+declaration	GElf_Ehdr *gelf_getehdr(Elf *elf, GElf_Ehdr *dst)
+version		SUNW_1.2
+end		
+
+function	gelf_update_ehdr
+include		<gelf.h>
+declaration	int gelf_update_ehdr(Elf *elf, GElf_Ehdr *src)
+version		SUNW_1.2
+end		
+
+function	gelf_newehdr
+include		<gelf.h>
+declaration	unsigned long gelf_newehdr(Elf *elf, int elfclass)
+version		SUNW_1.2
+end		
+
+function	gelf_getphdr
+include		<gelf.h>
+declaration	GElf_Phdr *gelf_getphdr(Elf *elf, int ndx, GElf_Phdr *dst)
+version		SUNW_1.2
+end		
+
+function	gelf_update_phdr
+include		<gelf.h>
+declaration	int gelf_update_phdr(Elf *elf, int ndx, GElf_Phdr *src)
+version		SUNW_1.2
+end		
+
+function	gelf_newphdr
+include		<gelf.h>
+declaration	unsigned long gelf_newphdr(Elf *elf, size_t phnum)
+version		SUNW_1.2
+end		
+
+function	gelf_getshdr
+include		<gelf.h>
+declaration	GElf_Shdr *gelf_getshdr(Elf_Scn *scn, GElf_Shdr *dst)
+version		SUNW_1.2
+end		
+
+function	gelf_update_shdr
+include		<gelf.h>
+declaration	int gelf_update_shdr(Elf_Scn *scn, GElf_Shdr *src)
+version		SUNW_1.2
+end		
+
+function	gelf_xlatetof
+include		<gelf.h>
+declaration	Elf_Data *gelf_xlatetof(Elf *elf, Elf_Data *dst, \
+			const Elf_Data *src, unsigned encode)
+version		SUNW_1.2
+end		
+
+function	gelf_xlatetom
+include		<gelf.h>
+declaration	Elf_Data *gelf_xlatetom(Elf *elf, Elf_Data *dst, \
+			const Elf_Data * src, unsigned encode)
+version		SUNW_1.2
+end		
+
+function	gelf_getsym
+include		<gelf.h>
+declaration	GElf_Sym *gelf_getsym(Elf_Data *data, int ndx, GElf_Sym *dst)
+version		SUNW_1.2
+end		
+
+function	gelf_update_sym
+include		<gelf.h>
+declaration	int gelf_update_sym(Elf_Data *dest, int ndx, GElf_Sym *src)
+version		SUNW_1.2
+end		
+
+function	gelf_getsyminfo
+include		<gelf.h>
+declaration	GElf_Syminfo *gelf_getsyminfo(Elf_Data *data, int ndx, GElf_Syminfo *dst)
+version		SUNW_1.2
+end		
+
+function	gelf_getmove
+include		<gelf.h>
+declaration	GElf_Move *gelf_getmove(Elf_Data * data, int ndx, GElf_Move *src)
+version		SUNW_1.2
+end		
+
+function	gelf_update_move
+include		<gelf.h>
+declaration	int gelf_update_move(Elf_Data *dest, int ndx, GElf_Move *src)
+version		SUNW_1.2
+end		
+
+function	gelf_update_syminfo
+include		<gelf.h>
+declaration	int gelf_update_syminfo(Elf_Data *dest, int ndx, \
+			GElf_Syminfo *src)
+version		SUNW_1.2
+end		
+
+function	gelf_getdyn
+include		<gelf.h>
+declaration	GElf_Dyn *gelf_getdyn(Elf_Data *src, int ndx, GElf_Dyn *dst)
+version		SUNW_1.2
+end		
+
+function	gelf_update_dyn
+include		<gelf.h>
+declaration	int gelf_update_dyn(Elf_Data *dst, int ndx, GElf_Dyn *src)
+version		SUNW_1.2
+end		
+
+function	gelf_getrela
+include		<gelf.h>
+declaration	GElf_Rela *gelf_getrela(Elf_Data *src, int ndx, GElf_Rela *dst)
+version		SUNW_1.2
+end		
+
+function	gelf_update_rela
+include		<gelf.h>
+declaration	int gelf_update_rela(Elf_Data *dst, int ndx, GElf_Rela *src)
+version		SUNW_1.2
+end		
+
+function	gelf_getrel
+include		<gelf.h>
+declaration	GElf_Rel *gelf_getrel(Elf_Data *src, int ndx, GElf_Rel *dst)
+version		SUNW_1.2
+end		
+
+function	gelf_update_rel
+include		<gelf.h>
+declaration	int gelf_update_rel(Elf_Data *dst, int ndx, GElf_Rel *src)
+version		SUNW_1.2
+end		
+
+function	gelf_getcap
+include		<gelf.h>
+declaration	GElf_Cap *gelf_getcap(Elf_Data *dst, int ndx, GElf_Cap *src)
+version		SUNW_1.5
+end
+
+function	gelf_update_cap
+include		<gelf.h>
+declaration	int gelf_update_cap(Elf_Data *dst, int ndx, GElf_Cap *src)
+version		SUNW_1.5
+end

--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/deleted_files/usr/src/cmd/sgs/libelf/spec/i386/Makefile	Tue Mar 14 09:22:52 2006 -0800
@@ -0,0 +1,45 @@
+#
+# CDDL HEADER START
+#
+# The contents of this file are subject to the terms of the
+# Common Development and Distribution License, Version 1.0 only
+# (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
+#
+#
+#ident	"%Z%%M%	%I%	%E% SMI"
+#
+# Copyright (c) 1998-1999 by Sun Microsystems, Inc.
+# All rights reserved.
+#
+# cmd/sgs/libelf/spec/i386/Makefile
+
+.KEEP_STATE:
+
+include	../Makefile.targ
+
+# Add arch specific objects here
+OBJECTS	+=
+
+include	$(SRC)/lib/Makefile.lib
+
+# Uncomment the following if the linker complains
+#i386_C_PICFLAGS  = -K PIC
+
+include	$(SRC)/lib/Makefile.spec
+ABILLIBC=
+
+install: $(ROOTABILIB)

--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/deleted_files/usr/src/cmd/sgs/libelf/spec/sparc/Makefile	Tue Mar 14 09:22:52 2006 -0800
@@ -0,0 +1,45 @@
+#
+# CDDL HEADER START
+#
+# The contents of this file are subject to the terms of the
+# Common Development and Distribution License, Version 1.0 only
+# (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
+#
+#
+#ident	"%Z%%M%	%I%	%E% SMI"
+#
+# Copyright (c) 1998-1999 by Sun Microsystems, Inc.
+# All rights reserved.
+#
+# cmd/sgs/libelf/spec/sparc/Makefile
+
+.KEEP_STATE:
+
+include	../Makefile.targ
+
+# Add arch specific objects here
+OBJECTS	+=
+
+include	$(SRC)/lib/Makefile.lib
+
+# Uncomment the following if the linker complains
+#sparc_C_PICFLAGS  = -K PIC
+
+include	$(SRC)/lib/Makefile.spec
+ABILLIBC=
+
+install: $(ROOTABILIB)

--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/deleted_files/usr/src/cmd/sgs/libelf/spec/sparcv9/Makefile	Tue Mar 14 09:22:52 2006 -0800
@@ -0,0 +1,46 @@
+#
+# CDDL HEADER START
+#
+# The contents of this file are subject to the terms of the
+# Common Development and Distribution License, Version 1.0 only
+# (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
+#
+#
+#ident	"%Z%%M%	%I%	%E% SMI"
+#
+# Copyright (c) 1997-1999 by Sun Microsystems, Inc.
+# All rights reserved.
+#
+# cmd/sgs/libelf/spec/sparcv9/Makefile
+
+.KEEP_STATE:
+
+include	../Makefile.targ
+
+# Add arch specific objects here
+OBJECTS	+=
+
+include	$(SRC)/lib/Makefile.lib
+include	$(SRC)/lib/Makefile.lib.64
+
+# Uncomment the following if the linker complains
+sparcv9_C_PICFLAGS  = -K PIC
+
+include	$(SRC)/lib/Makefile.spec
+ABILLIBC=
+
+install: $(ROOTABILIB64)

--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/deleted_files/usr/src/cmd/sgs/libelf/spec/versions	Tue Mar 14 09:22:52 2006 -0800
@@ -0,0 +1,71 @@
+#
+# Copyright 2005 Sun Microsystems, Inc.  All rights reserved.
+# Use is subject to license terms.
+#
+# CDDL HEADER START
+#
+# The contents of this file are subject to the terms of the
+# Common Development and Distribution License, Version 1.0 only
+# (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
+#
+# ident	"%Z%%M%	%I%	%E% SMI"
+#
+# Note: Even though the SUNW_1.1 version now contains no symbols
+# beyond what was present at Solaris 2.3, the SUNW_1.1 version MUST be 
+# present.  This is because applications built on 2.6 Beta 
+# (when it did contain symbols explicitly) may depend on it.
+#
+sparc {
+	SUNW_1.6:	{SUNW_1.5};
+	SUNW_1.5:	{SUNW_1.4};
+	SUNW_1.4:	{SUNW_1.3};
+	SUNW_1.3:	{SUNW_1.2};
+	SUNW_1.2:	{SUNW_1.1};
+	SUNW_1.1:	{SUNW_0.7};
+	SUNW_0.7;
+	SUNWprivate_1.1;
+}
+sparcv9 {
+	SUNW_1.6:	{SUNW_1.5};
+	SUNW_1.5:	{SUNW_1.4};
+	SUNW_1.4:	{SUNW_1.3};
+	SUNW_1.3:	{SUNW_1.2};
+	SUNW_1.2:	{SUNW_1.1};
+	SUNW_1.1:	{SUNW_0.7};
+	SUNW_0.7;
+	SUNWprivate_1.1;
+}
+i386 {
+	SUNW_1.6:	{SUNW_1.5};
+	SUNW_1.5:	{SUNW_1.4};
+	SUNW_1.4:	{SUNW_1.3};
+	SUNW_1.3:	{SUNW_1.2};
+	SUNW_1.2:	{SUNW_1.1};
+	SUNW_1.1:	{SUNW_0.7};
+	SUNW_0.7;
+	SUNWprivate_1.1;
+}
+amd64 {
+	SUNW_1.6:	{SUNW_1.5};
+	SUNW_1.5:	{SUNW_1.4};
+	SUNW_1.4:	{SUNW_1.3};
+	SUNW_1.3:	{SUNW_1.2};
+	SUNW_1.2:	{SUNW_1.1};
+	SUNW_1.1:	{SUNW_0.7};
+	SUNW_0.7;
+	SUNWprivate_1.1;
+}

--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/deleted_files/usr/src/cmd/sgs/libelf/spec/weak.spec	Tue Mar 14 09:22:52 2006 -0800
@@ -0,0 +1,228 @@
+#
+# Copyright 2005 Sun Microsystems, Inc.  All rights reserved.
+# Use is subject to license terms.
+#
+# CDDL HEADER START
+#
+# The contents of this file are subject to the terms of the
+# Common Development and Distribution License, Version 1.0 only
+# (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
+#
+#pragma ident	"%Z%%M%	%I%	%E% SMI"
+#
+# cmd/sgs/libelf/spec/weak.spec
+
+function	_elf_begin
+weak		elf_begin
+version		SUNWprivate_1.1
+end		
+
+function	_elf_memory
+weak		elf_memory
+version		SUNWprivate_1.1
+end		
+
+function	_elf_cntl
+weak		elf_cntl
+version		SUNWprivate_1.1
+end		
+
+function	_elf_end
+weak		elf_end
+version		SUNWprivate_1.1
+end		
+
+function	_elf_errno
+weak		elf_errno
+version		SUNWprivate_1.1
+end		
+
+function	_elf_errmsg
+weak		elf_errmsg
+version		SUNWprivate_1.1
+end		
+
+function	_elf_fill
+weak		elf_fill
+version		SUNWprivate_1.1
+end		
+
+function	_elf_flagdata
+weak		elf_flagdata
+version		SUNWprivate_1.1
+end		
+
+function	_elf_flagehdr
+weak		elf_flagehdr
+version		SUNWprivate_1.1
+end		
+
+function	_elf_flagelf
+weak		elf_flagelf
+version		SUNWprivate_1.1
+end		
+
+function	_elf_flagphdr
+weak		elf_flagphdr
+version		SUNWprivate_1.1
+end		
+
+function	_elf_flagscn
+weak		elf_flagscn
+version		SUNWprivate_1.1
+end		
+
+function	_elf_flagshdr
+weak		elf_flagshdr
+version		SUNWprivate_1.1
+end		
+
+function	_elf_getarhdr
+weak		elf_getarhdr
+version		SUNWprivate_1.1
+end		
+
+function	_elf_getarsym
+weak		elf_getarsym
+version		SUNWprivate_1.1
+end		
+
+function	_elf_getbase
+weak		elf_getbase
+version		SUNWprivate_1.1
+end		
+
+function	_elf_getdata
+weak		elf_getdata
+version		SUNWprivate_1.1
+end		
+
+function	_elf32_getehdr
+weak		elf32_getehdr
+version		SUNWprivate_1.1
+end		
+
+function	_elf_getident
+weak		elf_getident
+version		SUNWprivate_1.1
+end		
+
+function	_elf32_getphdr
+weak		elf32_getphdr
+version		SUNWprivate_1.1
+end		
+
+function	_elf_getscn
+weak		elf_getscn
+version		SUNWprivate_1.1
+end		
+
+function	_elf32_getshdr
+weak		elf32_getshdr
+version		SUNWprivate_1.1
+end		
+
+function	_elf_hash
+weak		elf_hash
+version		SUNWprivate_1.1
+end		
+
+function	_elf_kind
+weak		elf_kind
+version		SUNWprivate_1.1
+end		
+
+function	_elf_ndxscn
+weak		elf_ndxscn
+version		SUNWprivate_1.1
+end		
+
+function	_elf_newdata
+weak		elf_newdata
+version		SUNWprivate_1.1
+end		
+
+function	_elf32_newehdr
+weak		elf32_newehdr
+version		SUNWprivate_1.1
+end		
+
+function	_elf32_newphdr
+weak		elf32_newphdr
+version		SUNWprivate_1.1
+end		
+
+function	_elf_newscn
+weak		elf_newscn
+version		SUNWprivate_1.1
+end		
+
+function	_elf_next
+weak		elf_next
+version		SUNWprivate_1.1
+end		
+
+function	_elf_nextscn
+weak		elf_nextscn
+version		SUNWprivate_1.1
+end		
+
+function	_elf_rand
+weak		elf_rand
+version		SUNWprivate_1.1
+end		
+
+function	_elf_rawdata
+weak		elf_rawdata
+version		SUNWprivate_1.1
+end		
+
+function	_elf_rawfile
+weak		elf_rawfile
+version		SUNWprivate_1.1
+end		
+
+function	_elf_strptr
+weak		elf_strptr
+version		SUNWprivate_1.1
+end		
+
+function	_elf_update
+weak		elf_update
+version		SUNWprivate_1.1
+end		
+
+function	_elf32_fsize
+weak		elf32_fsize
+version		SUNWprivate_1.1
+end		
+
+function	_elf32_xlatetof
+weak		elf32_xlatetof
+version		SUNWprivate_1.1
+end		
+
+function	_elf32_xlatetom
+weak		elf32_xlatetom
+version		SUNWprivate_1.1
+end		
+
+function	_elf_version
+weak		elf_version
+version		SUNWprivate_1.1
+end		
+

--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/deleted_files/usr/src/cmd/sgs/librtld_db/common/lintsup.c	Tue Mar 14 09:22:52 2006 -0800
@@ -0,0 +1,42 @@
+/*
+ * CDDL HEADER START
+ *
+ * The contents of this file are subject to the terms of the
+ * Common Development and Distribution License, Version 1.0 only
+ * (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
+ */
+/* LINTLIBRARY */
+/* PROTOLIB1 */
+
+/*
+ * Copyright (c) 1998 by Sun Microsystems, Inc. 
+ * All rights reserved. 
+ */ 
+
+#pragma ident	"%Z%%M%	%I%	%E% SMI"
+
+/*
+ * Supplimental definitions for lint that help us avoid
+ * options like `-x' that filter out things we want to
+ * know about as well as things we don't.
+ */
+#include <thread.h>
+#include <rtld_db.h>
+#include "libld.h"
+#include "rtld.h"
+#include "msg.h"
+

--- a/usr/src/Targetdirs	Tue Mar 14 09:14:42 2006 -0800
+++ b/usr/src/Targetdirs	Tue Mar 14 09:22:52 2006 -0800
@@ -615,8 +615,6 @@
 $(ROOT)/usr/ccs/lib/llib-ll.ln:= 	REALPATH=../../lib/llib-ll.ln
 $(ROOT)/usr/ccs/lib/liby.so:=		REALPATH=../../lib/liby.so.1
 $(ROOT)/usr/ccs/lib/llib-ly.ln:= 	REALPATH=../../lib/llib-ly.ln
-$(ROOT)/usr/ccs/lib/libld.so.2:=	REALPATH=../../../lib/libld.so.2
-$(ROOT)/usr/ccs/lib/libld.so.3:=	REALPATH=../../../lib/libld.so.3
 $(ROOT)/usr/lib/libp/libc.so.1:=	REALPATH=../../../lib/libc.so.1
 $(ROOT)/usr/lib/lwp/libthread.so.1:=	REALPATH=../libthread.so.1
 $(ROOT)/usr/lib/lwp/libthread_db.so.1:=	REALPATH=../libthread_db.so.1
@@ -672,10 +670,6 @@
 	REALPATH=../../../lib/$(MACH64)/liby.so.1
 $(ROOT)/usr/ccs/lib/$(MACH64)/llib-ly.ln:= \
 	REALPATH=../../../lib/$(MACH64)/llib-ly.ln
-$(ROOT)/usr/ccs/lib/$(MACH64)/libld.so.2:= \
-	REALPATH=../../../../lib/$(MACH64)/libld.so.2
-$(ROOT)/usr/ccs/lib/$(MACH64)/libld.so.3:= \
-	REALPATH=../../../../lib/$(MACH64)/libld.so.3
 $(ROOT)/usr/lib/libp/$(MACH64)/libc.so.1:= \
 	REALPATH=../../../../lib/$(MACH64)/libc.so.1
 $(ROOT)/usr/lib/lwp/$(MACH64)/libthread.so.1:= \
@@ -716,13 +710,11 @@
 	/usr/ccs/lib/llib-ll.ln \
 	/usr/ccs/lib/liby.so \
 	/usr/ccs/lib/llib-ly.ln \
-	/usr/ccs/lib/libld.so.2 \
 	/usr/lib/libp/libc.so.1 \
 	/usr/lib/lwp/libthread.so.1 \
 	/usr/lib/lwp/libthread_db.so.1
 
 SYM.USRCCSLIB64= \
-	/usr/ccs/lib/libld.so.3 \
 	/usr/ccs/lib/$(MACH64)/libcurses.so \
 	/usr/ccs/lib/$(MACH64)/llib-lcurses.ln \
 	/usr/ccs/lib/$(MACH64)/libform.so \
@@ -748,8 +740,6 @@
 	/usr/ccs/lib/$(MACH64)/llib-ll.ln \
 	/usr/ccs/lib/$(MACH64)/liby.so \
 	/usr/ccs/lib/$(MACH64)/llib-ly.ln \
-	/usr/ccs/lib/$(MACH64)/libld.so.2 \
-	/usr/ccs/lib/$(MACH64)/libld.so.3 \
 	/usr/lib/libp/$(MACH64)/libc.so.1 \
 	/usr/lib/lwp/$(MACH64)/libthread.so.1 \
 	/usr/lib/lwp/$(MACH64)/libthread_db.so.1
@@ -818,8 +808,6 @@
 $(ROOT)/usr/lib/libintl.so:=		REALPATH=../../lib/libintl.so.1
 $(ROOT)/usr/lib/libkstat.so.1:=		REALPATH=../../lib/libkstat.so.1
 $(ROOT)/usr/lib/libkstat.so:=		REALPATH=../../lib/libkstat.so.1
-$(ROOT)/usr/lib/libld.so.2:=		REALPATH=../../lib/libld.so.2
-$(ROOT)/usr/lib/libld.so.3:=		REALPATH=../../lib/libld.so.3
 $(ROOT)/usr/lib/liblddbg.so.4:=		REALPATH=../../lib/liblddbg.so.4
 $(ROOT)/usr/lib/libmd5.so.1:=		REALPATH=../../lib/libmd5.so.1
 $(ROOT)/usr/lib/libmd5.so:=		REALPATH=../../lib/libmd5.so.1
@@ -1081,10 +1069,6 @@
 	REALPATH=../../../lib/$(MACH64)/libkstat.so.1
 $(ROOT)/usr/lib/$(MACH64)/libkstat.so:= \
 	REALPATH=../../../lib/$(MACH64)/libkstat.so.1
-$(ROOT)/usr/lib/$(MACH64)/libld.so.2:= \
-	REALPATH=../../../lib/$(MACH64)/libld.so.2
-$(ROOT)/usr/lib/$(MACH64)/libld.so.3:= \
-	REALPATH=../../../lib/$(MACH64)/libld.so.3
 $(ROOT)/usr/lib/$(MACH64)/liblddbg.so.4:= \
 	REALPATH=../../../lib/$(MACH64)/liblddbg.so.4
 $(ROOT)/usr/lib/$(MACH64)/libmd5.so.1:= \
@@ -1376,7 +1360,6 @@
 	/usr/lib/libintl.so.1 \
 	/usr/lib/libkstat.so \
 	/usr/lib/libkstat.so.1 \
-	/usr/lib/libld.so.2 \
 	/usr/lib/liblddbg.so.4 \
 	/usr/lib/libmd5.so \
 	/usr/lib/libmd5.so.1 \
@@ -1602,8 +1585,6 @@
 	/usr/lib/$(MACH64)/libintl.so.1 \
 	/usr/lib/$(MACH64)/libkstat.so \
 	/usr/lib/$(MACH64)/libkstat.so.1 \
-	/usr/lib/$(MACH64)/libld.so.2 \
-	/usr/lib/$(MACH64)/libld.so.3 \
 	/usr/lib/$(MACH64)/liblddbg.so.4 \
 	/usr/lib/$(MACH64)/libmd5.so \
 	/usr/lib/$(MACH64)/libmd5.so.1 \
@@ -1716,8 +1697,7 @@
 	/usr/lib/$(MACH64)/nss_files.so.1 \
 	/usr/lib/$(MACH64)/nss_nis.so.1 \
 	/usr/lib/$(MACH64)/nss_nisplus.so.1 \
-	/usr/lib/$(MACH64)/nss_user.so.1 \
-	/usr/lib/libld.so.3
+	/usr/lib/$(MACH64)/nss_user.so.1
 
 $(SYM.USRLIB:%=$(ROOT)%):= \
     INS.dir= -$(RM) $@; $(SYMLINK) $(REALPATH) $@; \

--- a/usr/src/cmd/sgs/Makefile	Tue Mar 14 09:14:42 2006 -0800
+++ b/usr/src/cmd/sgs/Makefile	Tue Mar 14 09:22:52 2006 -0800
@@ -28,11 +28,8 @@
 include		$(SRC)/cmd/Makefile.cmd
 
 SUBDIRS-common= libconv		\
-		.WAIT		\
 		libdl		\
-		.WAIT		\
 		libelf		\
-		.WAIT		\
 		liblddbg	\
 		.WAIT		\
 		libld		\

--- a/usr/src/cmd/sgs/Makefile.com	Tue Mar 14 09:14:42 2006 -0800
+++ b/usr/src/cmd/sgs/Makefile.com	Tue Mar 14 09:22:52 2006 -0800
@@ -2,9 +2,8 @@
 # CDDL HEADER START
 #
 # The contents of this file are subject to the terms of the
-# Common Development and Distribution License, Version 1.0 only
-# (the "License").  You may not use this file except in compliance
-# with the License.
+# 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.
@@ -19,27 +18,30 @@
 #
 # CDDL HEADER END
 #
+
+#
+# Copyright 2006 Sun Microsystems, Inc.  All rights reserved.
+# Use is subject to license terms.
 #
 # ident	"%Z%%M%	%I%	%E% SMI"
 #
-# Copyright 2005 Sun Microsystems, Inc.  All rights reserved.
-# Use is subject to license terms.
-#
-# cmd/sgs/Makefile.com
 
 .KEEP_STATE:
+.KEEP_STATE_FILE: .make.state.$(MACH)
+
 
 include		$(SRC)/cmd/sgs/Makefile.var
 
-SRCBASE=	../../../..
+SRCBASE =	../../../..
 
-i386_ARCH=	$(VAR_I386_ARCH)
-sparc_ARCH=	sparc
+i386_ARCH =	$(VAR_I386_ARCH)
+sparc_ARCH =	sparc
 
-ARCH=		$($(MACH)_ARCH)
+ARCH =		$($(MACH)_ARCH)
 
-ROOTCCSBIN64=		$(ROOTCCSBIN)/$(MACH64)
-ROOTCCSBINPROG64=	$(PROG:%=$(ROOTCCSBIN64)/%)
+ROOTCCSBIN64 =	$(ROOTCCSBIN)/$(MACH64)
+ROOTCCSBINPROG64 = \
+		$(PROG:%=$(ROOTCCSBIN64)/%)
 
 # Establish any global flags.
 
@@ -47,17 +49,17 @@
 # checking.  This is automatically enabled for DEBUG builds, not for non-debug
 # builds.  Unset the global C99_DISABLE flag to insure we uncover all compiler
 # warnings/errors.
-DEBUG=
+DEBUG =
 $(NOT_RELEASE_BUILD)DEBUG = -DDEBUG
 
-C99_DISABLE=	$(C99_ENABLE)
+C99_DISABLE =	$(C99_ENABLE)
 
 CFLAGS +=	$(CCVERBOSE) $(DEBUG) $(XFFLAG)
 CFLAGS64 +=	$(CCVERBOSE) $(DEBUG) $(XFFLAG)
 
 # Reassign CPPFLAGS so that local search paths are used before any parent
 # $ROOT paths.
-CPPFLAGS=	-I. -I../common -I../../include -I../../include/$(MACH) \
+CPPFLAGS =	-I. -I../common -I../../include -I../../include/$(MACH) \
 		$(VAR_CPPFLAGS) $(CPPFLAGS.master)
 
 # PICS64 is unique to our environment
@@ -70,62 +72,59 @@
 
 # Establish the local tools, proto and package area.
 
-SGSHOME=	$(SRC)/cmd/sgs
-SGSPROTO=	$(SGSHOME)/proto/$(MACH)
-SGSTOOLS=	$(SGSHOME)/tools
-SGSMSGID=	$(SGSHOME)/messages
-SGSMSGDIR=	$(SGSHOME)/messages/$(MACH)
-SGSONLD=	$(ROOT)/opt/SUNWonld
-SGSRPATH=	/usr/lib
-SGSRPATH64=	$(SGSRPATH)/$(MACH64)
+SGSHOME =	$(SRC)/cmd/sgs
+SGSPROTO =	$(SGSHOME)/proto/$(MACH)
+SGSTOOLS =	$(SGSHOME)/tools
+SGSMSGID =	$(SGSHOME)/messages
+SGSMSGDIR =	$(SGSHOME)/messages/$(MACH)
+SGSONLD =	$(ROOT)/opt/SUNWonld
+SGSRPATH =	/usr/lib
+SGSRPATH64 =	$(SGSRPATH)/$(MACH64)
 
 #
-# Macros to be used to include link against libconv and include
-# vernote.o
+# Macros to be used to include link against libconv and include vernote.o
 #
-VERSREF=	-ulink_ver_string
-CONVLIBDIR=	-L$(SGSHOME)/libconv/$(MACH)
-CONVLIBDIR64=	-L$(SGSHOME)/libconv/$(MACH64)
+VERSREF =	-ulink_ver_string
+
+LDLIBDIR =	-L$(SGSHOME)/libld/$(MACH)
+LDLIBDIR64 =	-L$(SGSHOME)/libld/$(MACH64)
 
-ELFLIBDIR=	-L$(SGSHOME)/libelf/$(MACH)
-ELFLIBDIR64=	-L$(SGSHOME)/libelf/$(MACH64)
+CONVLIBDIR =	-L$(SGSHOME)/libconv/$(MACH)
+CONVLIBDIR64 =	-L$(SGSHOME)/libconv/$(MACH64)
 
-LDDBGLIBDIR=	-L$(SGSHOME)/liblddbg/$(MACH)
-LDDBGLIBDIR64=	-L$(SGSHOME)/liblddbg/$(MACH64)
+ELFLIBDIR =	-L$(SGSHOME)/libelf/$(MACH)
+ELFLIBDIR64 =	-L$(SGSHOME)/libelf/$(MACH64)
 
-
+LDDBGLIBDIR =	-L$(SGSHOME)/liblddbg/$(MACH)
+LDDBGLIBDIR64 =	-L$(SGSHOME)/liblddbg/$(MACH64)
 
 # The cmd/Makefile.com and lib/Makefile.com define TEXT_DOMAIN.  We don't need
 # this definition as the sgs utilities obtain their domain via sgsmsg(1l).
 
-DTEXTDOM=
-
+DTEXTDOM =
 
 # Define any generic sgsmsg(1l) flags.  The default message generation system
 # is to use gettext(3i), add the -C flag to switch to catgets(3c).
 
-SGSMSG=		$(SGSTOOLS)/$(MACH)/sgsmsg
-CHKMSG=		$(SGSTOOLS)/chkmsg.sh
+SGSMSG =	$(SGSTOOLS)/$(MACH)/sgsmsg
+CHKMSG =	$(SGSTOOLS)/chkmsg.sh
 
 SGSMSGVFLAG =
 SGSMSGFLAGS =	$(SGSMSGVFLAG) -i $(SGSMSGID)/sgs.ident
-CHKMSGFLAGS=	$(SGSMSGTARG:%=-m %) $(SGSMSGCHK:%=-m %)
-
+CHKMSGFLAGS =	$(SGSMSGTARG:%=-m %) $(SGSMSGCHK:%=-m %)
 
 # Native targets should use the minimum of ld(1) flags to allow building on
 # previous releases.  We use mapfiles to scope, but don't bother versioning.
 
-native:=	DYNFLAGS = $(MAPOPTS) -R$(SGSPROTO) -L$(SGSPROTO) $(ZNOVERSION)
+native :=	DYNFLAGS = $(MAPOPTS) -R$(SGSPROTO) -L$(SGSPROTO) $(ZNOVERSION)
 
-USE_PROTO=	-Yl,$(SGSPROTO)
-
-.KEEP_STATE_FILE: .make.state.$(MACH)
+USE_PROTO =	-Yl,$(SGSPROTO)
 
 #
 # lint-related stuff
 #
 
-DASHES=		"------------------------------------------------------------"
+DASHES =	"------------------------------------------------------------"
 
 LIBNAME32 =	$(LIBNAME:%=%32)
 LIBNAME64 =	$(LIBNAME:%=%64)
@@ -144,18 +143,21 @@
 
 LINTFLAGS =	-m -errtags=yes -erroff=E_SUPPRESSION_DIRECTIVE_UNUSED
 LINTFLAGS64 =	-m -errtags=yes -erroff=E_SUPPRESSION_DIRECTIVE_UNUSED \
-		-errchk=longptr64 $(VAR_LINTFLAGS64)
+		    $(VAR_LINTFLAGS64) \
 
 #
-# These libraries have two resulting lint libraries.
-# If a dependency is declared using these variables,
-# the substitution for the 32/64 versions at lint time
-# will happen automatically (see Makefile.targ).
+# These libraries have two resulting lint libraries.  If a dependency is
+# declared using these variables, the substitution for the 32/64 versions at
+# lint time happens automatically (see Makefile.targ).
 #
-LDDBG_LIB=	-llddbg
-LDDBG_LIB32=	-llddbg32
-LDDBG_LIB64=	-llddbg64
+LD_LIB =	-lld
+LD_LIB32 =	-lld32
+LD_LIB64 =	-lld64
 
-LD_LIB=		-lld
-LD_LIB32=	-lld32
-LD_LIB64=	-lld64
+LDDBG_LIB =	-llddbg
+LDDBG_LIB32 =	-llddbg32
+LDDBG_LIB64 =	-llddbg64
+
+CONV_LIB =	-lconv
+CONV_LIB32 =	-lconv32
+CONV_LIB64 =	-lconv64

--- a/usr/src/cmd/sgs/Makefile.sub	Tue Mar 14 09:14:42 2006 -0800
+++ b/usr/src/cmd/sgs/Makefile.sub	Tue Mar 14 09:22:52 2006 -0800
@@ -2,9 +2,8 @@
 # CDDL HEADER START
 #
 # The contents of this file are subject to the terms of the
-# Common Development and Distribution License, Version 1.0 only
-# (the "License").  You may not use this file except in compliance
-# with the License.
+# 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.
@@ -19,10 +18,11 @@
 #
 # CDDL HEADER END
 #
+
 #
 # ident	"%Z%%M%	%I%	%E% SMI"
 #
-# Copyright 2003 Sun Microsystems, Inc.  All rights reserved.
+# Copyright 2006 Sun Microsystems, Inc.  All rights reserved.
 # Use is subject to license terms.
 #
 # Standard subdirs makefile for the sgs area.
@@ -42,8 +42,7 @@
 # to build whatever 64-bit directories we actually find as a side-effect
 # of descending into the 32-bit directories.  Ick.
 
-# Note, SPECDIR is defined only in those targets that require spec files.
-SUBDIRS =	$(PRESUBDIRS) $(SPECDIR) $(MACH) $(EXTRASUBDIRS)
+SUBDIRS =	$(MACH) $(EXTRASUBDIRS)
 
 all :=		TARGET= all
 clean :=	TARGET= clean
@@ -55,8 +54,8 @@
 package :=	TARGET= package
 chkmsg :=	TARGET= chkmsg
 
+.KEEP_STATE:
 .KEEP_STATE_FILE: .make.state.$(MACH)
-.KEEP_STATE:
 
 all clean clobber delete install lint catalog package chkmsg: \
 		$(SUBDIRS)

--- a/usr/src/cmd/sgs/Makefile.sub.64	Tue Mar 14 09:14:42 2006 -0800
+++ b/usr/src/cmd/sgs/Makefile.sub.64	Tue Mar 14 09:22:52 2006 -0800
@@ -2,9 +2,8 @@
 # CDDL HEADER START
 #
 # The contents of this file are subject to the terms of the
-# Common Development and Distribution License, Version 1.0 only
-# (the "License").  You may not use this file except in compliance
-# with the License.
+# 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.
@@ -19,13 +18,15 @@
 #
 # CDDL HEADER END
 #
+
 #
-# Copyright (c) 1997, by Sun Microsystems, Inc.
-# All rights reserved.
+# Copyright 2006 Sun Microsystems, Inc.  All rights reserved.
+# Use is subject to license terms.
 #
-#ident	"%Z%%M%	%I%	%E% SMI"
+# ident	"%Z%%M%	%I%	%E% SMI"
+#
 
 #
 # Include overrides for building 64-bit objects
 #
-include ../../../../Makefile.master.64
+include		$(SRC)/Makefile.master.64

--- a/usr/src/cmd/sgs/Makefile.targ	Tue Mar 14 09:14:42 2006 -0800
+++ b/usr/src/cmd/sgs/Makefile.targ	Tue Mar 14 09:22:52 2006 -0800
@@ -2,9 +2,8 @@
 # CDDL HEADER START
 #
 # The contents of this file are subject to the terms of the
-# Common Development and Distribution License, Version 1.0 only
-# (the "License").  You may not use this file except in compliance
-# with the License.
+# 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.
@@ -19,64 +18,59 @@
 #
 # CDDL HEADER END
 #
+
 #
-# Copyright 2004 Sun Microsystems, Inc.  All rights reserved.
+# Copyright 2006 Sun Microsystems, Inc.  All rights reserved.
 # Use is subject to license terms.
 #
 # ident	"%Z%%M%	%I%	%E% SMI"
 #
-# cmd/sgs/Makefile.targ
 
 
 ################################################################################
 #
 # Linting the Linker Libraries
 #
-#  Several of the linker's libraries are, in whole or in part,
-#  are built in two passes, once as Elf32 and once as Elf64,
-#  i.e. with -D_ELF64 defined.  Lint needs to be able to do
-#  both passes, but combining the two is problematic for the
-#  2nd pass of lint, as it sees many interfaces as being defined
-#  both ways and considers them to be incompatible.  The targets
-#  defined here allow for both passes to live independently.
-#  This means that both the lint.out, and the lint library itself
-#  get generated separately, to different output files.  The
-#  lint.out's get combined into a single lint.out report, and
-#  the lint libraries get generated with a 32/64 suffix.  The
-#  dependents on these lint libraries, then, choose which version
-#  the need to use.  Substitutions can be made automatically if
-#  the macro's defined in ./Makefile.com are used to specify
-#  the dependency, for those libs that need them.
+#  Several of the linker's libraries are, in whole or in part, built in two
+#  passes, once as Elf32 and once as Elf64 (i.e. with -D_ELF64 defined).  Lint
+#  needs to be able to do both passes, but combining the two is problematic for
+#  the 2nd pass of lint, as it sees many interfaces as being defined both ways
+#  and considers them to be incompatible.  The targets defined here allow for
+#  both passes to live independently.  This means that both the lint.out, and
+#  the lint library itself get generated separately, to different output files.
+#  The lint.out's get combined into a single lint.out report, and the lint
+#  libraries get generated with a 32/64 suffix.  The dependents on these lint
+#  libraries, then, choose which version they need to use.  Substitutions can
+#  be made automatically if the macro's defined in ./Makefile.com are used to
+#  specify the dependency, for those libs that need them.
 #
 # Don't
 #
-#  Don't use the /*LINTLIBRARY*/ directive in linker libraries,
-#  this disables some important checks, including the ability
-#  to test format strings from the msg.h files.
+#  Don't use the /*LINTLIBRARY*/ directive in linker libraries, this disables
+#  some important checks, including the ability to test format strings from the
+#  msg.h files.
 #
-#  Don't use the `-x' option to lint when linting linker libraries.
-#  This masks all the dead wood in our own header files.  Instead,
-#  there has been added to the relevant common directories a file
-#  called `lintsup.c' which is used to mask out the headers that
-#  we aren't interested in.  This method is used for libraries, like
-#  libld, which have their own header files, but is irrelevant to
-#  libraries like libldstab which exports no interface of it's own.
+#  Don't use the `-x' option to lint when linting linker libraries.  This masks
+#  all the dead wood in our own header files.  Instead, there has been added to
+#  the relevant common directories a file called `lintsup.c' which is used to
+#  mask out the headers that we aren't interested in.  This method is used for
+#  libraries, like libld, which have their own header files, but is irrelevant
+#  to libraries like libldstab which exports no interface of it's own.
 #
-#  The `lintsup.c' file can also be used, in some cases, to mask
-#  out other issues that lint won't otherwise shut up about.
+#  The `lintsup.c' file can also be used, in some cases, to mask out other
+#  issues that lint won't otherwise shut up about.
 #
 # Other Lint Options
 #
-#  `-m' has been added to the LINTFLAGS.  Warnings about globals
-#  that could be static are irrelevant because we use mapfiles to
-#  scope down unnecessary globals.
+#  `-m' has been added to the LINTFLAGS.  Warnings about globals that could be
+#  static are irrelevant as we use mapfiles to scope down unnecessary globals.
 #
-#  `-u' is used in the LINTFLAGS for libraries, otherwise lint
-#  tends to be very noisy.
+#  `-u' is used in the LINTFLAGS for libraries, otherwise lint tends to be very
+#  noisy.
 #
-#  `-x' is avoided for libraries, but is used for executables
-#  because all we care about is that what we use is defined,
-#  not about declarations in public headers that we don't use.
+#  `-x' is avoided for libraries, but is used for executables because all we
+#  care about is that what we use is defined, not about declarations in public
+#  headers that we don't use.
 #
 # Relevant variables:
 #
@@ -119,13 +113,16 @@
 LINTOUT =	$(LINTOUT1)
 
 #
-# If LD_LIB or LDDBG_LIB is added to LDLIBS, then the
-# right lint library should be picked up automatically.
+# If LD_LIB, LDDBG_LIB, or CONV_LIB is added to LDLIBS, then the right lint
+# library should be picked up automatically.
 #
 $(LINTOUT32) :=	LD_LIB=$(LD_LIB32)
 $(LINTOUT32) :=	LDDBG_LIB=$(LDDBG_LIB32)
+$(LINTOUT32) :=	CONV_LIB=$(CONV_LIB32)
+
 $(LINTOUT64) :=	LD_LIB=$(LD_LIB64)
 $(LINTOUT64) :=	LDDBG_LIB=$(LDDBG_LIB64)
+$(LINTOUT64) :=	CONV_LIB=$(CONV_LIB64)
 
 #
 # Force $(LINTLIB) in order to help the $(SGSLINTOUT)
@@ -185,16 +182,20 @@
 $(ROOTLIBDIR)/$(LINTLIBSRC): ../common/$(LINTLIBSRC)
 	$(INS.file) ../common/$(LINTLIBSRC)
 
-$(VAR_POUND_1)$(ROOTFS_LIBDIR)/$(LIBLINKS): $(ROOTFS_LIBDIR)/$(LIBLINKS)$(VERS)
+$(VAR_POUND_1)$(ROOTFS_LIBDIR)/$(LIBLINKS): \
+	$(ROOTFS_LIBDIR)/$(LIBLINKS)$(VERS)
 $(VAR_POUND_1)	$(INS.liblink)
 
-$(VAR_POUND_1)$(ROOTFS_LIBDIR64)/$(LIBLINKS): $(ROOTFS_LIBDIR64)/$(LIBLINKS)$(VERS)
+$(VAR_POUND_1)$(ROOTFS_LIBDIR64)/$(LIBLINKS): \
+	$(ROOTFS_LIBDIR64)/$(LIBLINKS)$(VERS)
 $(VAR_POUND_1)	$(INS.liblink64)
 
-$(VAR_POUND_1)$(ROOTFS_LIBDIR)/$(LIBLINKSCCC): $(ROOTFS_LIBDIR)/$(LIBLINKSCCC)$(VERS)
+$(VAR_POUND_1)$(ROOTFS_LIBDIR)/$(LIBLINKSCCC): \
+	$(ROOTFS_LIBDIR)/$(LIBLINKSCCC)$(VERS)
 $(VAR_POUND_1)	$(INS.liblinkccc)
 
-$(VAR_POUND_1)$(ROOTFS_LIBDIR64)/$(LIBLINKSCCC): $(ROOTFS_LIBDIR64)/$(LIBLINKSCCC)$(VERS)
+$(VAR_POUND_1)$(ROOTFS_LIBDIR64)/$(LIBLINKSCCC): \
+	$(ROOTFS_LIBDIR64)/$(LIBLINKSCCC)$(VERS)
 $(VAR_POUND_1)	$(INS.liblinkccc64)
 
 FRC:

--- a/usr/src/cmd/sgs/Makefile.var	Tue Mar 14 09:14:42 2006 -0800
+++ b/usr/src/cmd/sgs/Makefile.var	Tue Mar 14 09:22:52 2006 -0800
@@ -2,9 +2,8 @@
 # CDDL HEADER START
 #
 # The contents of this file are subject to the terms of the
-# Common Development and Distribution License, Version 1.0 only
-# (the "License").  You may not use this file except in compliance
-# with the License.
+# 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.
@@ -19,26 +18,24 @@
 #
 # CDDL HEADER END
 #
+
+#
+# Copyright 2006 Sun Microsystems, Inc.  All rights reserved.
+# Use is subject to license terms.
 #
 # ident	"%Z%%M%	%I%	%E% SMI"
 #
-# Copyright 2004 Sun Microsystems, Inc.  All rights reserved.
-# Use is subject to license terms.
-#
-# cmd/sgs/Makefile.var
-#
 
-# The link-editor related source files and Makefile files
-# are unified for on10-gate, on{81,28,998}-patch gates.
-# However, some of the compiler pre-processor flags, linker flags
-# are different among the releases. This file is used to
-# specify such flags. 
+# The link-editor related source files and Makefile files are normally unified
+# across all presently maintained release gates.  However, some of the compiler
+# pre-processor flags, linker flags are different among the releases.  This
+# file is used to specify such flags. 
 # 
 # This file is included by the ./Makefile.com.
 # 
-# This file should be the only file which is different
-# among /ws/{on10-gate,on{81,28,998}-patch} workspaces
-# among the files which generate link-editors and related tools.
+# This file should be the only file which is different among the presently
+# maintained release workspaces and the files that generate the link-editors
+# and related tools.
 
 #
 # CPPFEATUREMACROS provides for selectively turning on/off features within the
@@ -114,21 +111,15 @@
 
 VAR_LINTFLAGS64=	-Xarch=$(MACH64:sparcv9=v9)
 VAR_I386_ARCH=		intel
+
 VAR_PLAT_sparc=		sparc
 VAR_PLAT_i386=		intel/ia32
 VAR_PLAT_amd64=		intel/amd64
-VAR_MAPDIR_sparc=	../spec/sparc
-VAR_MAPDIR_sparcv9=	../spec/sparcv9
-VAR_MAPDIR_i386=	../spec/i386
-VAR_MAPDIR_amd64=	../spec/amd64
 
 VAR_POUND_1=
 VAR_POUND_2=		$(POUND_SIGN)
 VAR_POUND_3=		$(POUND_SIGN)
 
-VAR_SPEC_ON=		
-VAR_SPEC_OFF=		$(POUND_SIGN)
-
 #
 # VAR_AVLDIR - directory to find avl.c in.
 #
@@ -144,7 +135,7 @@
 # files avl.c, avl.h and avl_impl.h until these files are back ported into
 # the system.
 #
-VAR_AVLDIR=$(SRCBASE)/common/avl
+VAR_AVLDIR=		$(SRCBASE)/common/avl
 VAR_AVLINCDIR=
 
 #

--- a/usr/src/cmd/sgs/crle/Makefile.com	Tue Mar 14 09:14:42 2006 -0800
+++ b/usr/src/cmd/sgs/crle/Makefile.com	Tue Mar 14 09:22:52 2006 -0800
@@ -2,9 +2,8 @@
 # CDDL HEADER START
 #
 # The contents of this file are subject to the terms of the
-# Common Development and Distribution License, Version 1.0 only
-# (the "License").  You may not use this file except in compliance
-# with the License.
+# 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.
@@ -19,8 +18,9 @@
 #
 # CDDL HEADER END
 #
+
 #
-# Copyright 2004 Sun Microsystems, Inc.  All rights reserved.
+# Copyright 2006 Sun Microsystems, Inc.  All rights reserved.
 # Use is subject to license terms.
 #
 # ident	"%Z%%M%	%I%	%E% SMI"
@@ -51,7 +51,7 @@
 		$(CPPFLAGS.master) -D__EXTENSIONS__
 LDFLAGS +=	$(VERSREF) $(USE_PROTO) -M$(MAPFILE) \
 			'-R$$ORIGIN/../lib' $(ZNOLAZYLOAD)
-LDLIBS +=	-lelf $(CONVLIBDIR) -lconv $(DLLIB)
+LDLIBS +=	-lelf $(CONVLIBDIR) $(CONV_LIB) $(DLLIB)
 LINTFLAGS +=	-mx
 
 BLTDEFS=        msg.h

--- a/usr/src/cmd/sgs/crle/common/print.c	Tue Mar 14 09:14:42 2006 -0800
+++ b/usr/src/cmd/sgs/crle/common/print.c	Tue Mar 14 09:22:52 2006 -0800
@@ -2,9 +2,8 @@
  * CDDL HEADER START
  *
  * The contents of this file are subject to the terms of the
- * Common Development and Distribution License, Version 1.0 only
- * (the "License").  You may not use this file except in compliance
- * with the License.
+ * 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.
@@ -19,8 +18,9 @@
  *
  * CDDL HEADER END
  */
+
 /*
- * Copyright 2004 Sun Microsystems, Inc.  All rights reserved.
+ * Copyright 2006 Sun Microsystems, Inc.  All rights reserved.
  * Use is subject to license terms.
  */
 #pragma ident	"%Z%%M%	%I%	%E% SMI"
@@ -265,7 +265,7 @@
 		const char	*fmt;
 
 		if (head->ch_dlflags)
-			fmt = conv_dlflag_str(head->ch_dlflags, 0);
+			fmt = conv_dl_flag(head->ch_dlflags, 0);
 		else
 			fmt = MSG_ORIG(MSG_STR_EMPTY);
 
@@ -287,7 +287,7 @@
 		if (head->ch_dlflags &&
 		    (head->ch_dlflags != RTLD_REL_RELATIVE)) {
 			(void) snprintf(_cmd, PATH_MAX, MSG_ORIG(MSG_CMD_FLAGS),
-			    conv_dlflag_str(head->ch_dlflags, 1));
+			    conv_dl_flag(head->ch_dlflags, 1));
 			cmd = strcpy(alloca(strlen(_cmd) + 1), _cmd);
 			if (list_append(&cmdline, cmd) == 0)
 				return (1);
@@ -362,12 +362,12 @@
 #ifndef	SGS_PRE_UNIFIED_PROCESS
 			if ((head->ch_cnflags & RTC_HDR_UPM) == 0) {
 				if (head->ch_cnflags & RTC_HDR_64)
-					str = conv_upm_string(str,
+					str = conv_config_upm(str,
 					    MSG_ORIG(MSG_PTH_OLDDLP_64),
 					    MSG_ORIG(MSG_PTH_UPDLP_64),
 					    MSG_PTH_UPDLP_64_SIZE);
 				else
-					str = conv_upm_string(str,
+					str = conv_config_upm(str,
 					    MSG_ORIG(MSG_PTH_OLDDLP),
 					    MSG_ORIG(MSG_PTH_UPDLP),
 					    MSG_PTH_UPDLP_SIZE);
@@ -429,12 +429,12 @@
 #ifndef	SGS_PRE_UNIFIED_PROCESS
 			if ((head->ch_cnflags & RTC_HDR_UPM) == 0) {
 				if (head->ch_cnflags & RTC_HDR_64)
-					str = conv_upm_string(str,
+					str = conv_config_upm(str,
 					    MSG_ORIG(MSG_PTH_OLDTD_64),
 					    MSG_ORIG(MSG_PTH_UPTD_64),
 					    MSG_PTH_UPTD_64_SIZE);
 				else
-					str = conv_upm_string(str,
+					str = conv_config_upm(str,
 					    MSG_ORIG(MSG_PTH_OLDTD),
 					    MSG_ORIG(MSG_PTH_UPTD),
 					    MSG_PTH_UPTD_SIZE);

--- a/usr/src/cmd/sgs/dump/Makefile.com	Tue Mar 14 09:14:42 2006 -0800
+++ b/usr/src/cmd/sgs/dump/Makefile.com	Tue Mar 14 09:22:52 2006 -0800
@@ -2,9 +2,8 @@
 # CDDL HEADER START
 #
 # The contents of this file are subject to the terms of the
-# Common Development and Distribution License, Version 1.0 only
-# (the "License").  You may not use this file except in compliance
-# with the License.
+# 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.
@@ -19,8 +18,9 @@
 #
 # CDDL HEADER END
 #
+
 #
-# Copyright 2004 Sun Microsystems, Inc.  All rights reserved.
+# Copyright 2006 Sun Microsystems, Inc.  All rights reserved.
 # Use is subject to license terms.
 #
 # ident	"%Z%%M%	%I%	%E% SMI"
@@ -49,7 +49,7 @@
 
 DEMLIB=		-L../../sgsdemangler/$(MACH)
 DEMLIB64=	-L../../sgsdemangler/$(MACH64)
-LDLIBS +=	$(DEMLIB) -ldemangle $(CONVLIBDIR) -lconv \
+LDLIBS +=	$(DEMLIB) -ldemangle $(CONVLIBDIR) $(CONV_LIB) \
 		$(ELFLIBDIR) -lelf
 
 LINTSRCS =	$(SRCS)

--- a/usr/src/cmd/sgs/dump/Makefile.targ	Tue Mar 14 09:14:42 2006 -0800
+++ b/usr/src/cmd/sgs/dump/Makefile.targ	Tue Mar 14 09:22:52 2006 -0800
@@ -2,9 +2,8 @@
 # CDDL HEADER START
 #
 # The contents of this file are subject to the terms of the
-# Common Development and Distribution License, Version 1.0 only
-# (the "License").  You may not use this file except in compliance
-# with the License.
+# 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.
@@ -20,17 +19,16 @@
 # CDDL HEADER END
 #
 #
-# ident	"%Z%%M%	%I%	%E% SMI"
+# Copyright 2006 Sun Microsystems, Inc.  All rights reserved.
+# Use is subject to license terms.
 #
-# Copyright 1998,2002 Sun Microsystems, Inc.  All rights reserved.
-# Use is subject to license terms.
+# ident	"%Z%%M%	%I%	%E% SMI"
 #
 
 %.o:		../common/%.c
 		$(COMPILE.c) $<
 		$(POST_PROCESS_O)
 
-
 $(PROG):	$(OBJS)
 		$(LINK.c) $(OBJS) -o $@ $(LDLIBS)
 		$(POST_PROCESS)
@@ -46,7 +44,5 @@
 clean:
 		$(RM) $(OBJS) $(CLEANFILES)
 
-lint:		$(LINTOUT32) $(SGSLINTOUT)
-
 include		$(SRC)/cmd/Makefile.targ
 include		$(SRC)/cmd/sgs/Makefile.targ

--- a/usr/src/cmd/sgs/dump/amd64/Makefile	Tue Mar 14 09:14:42 2006 -0800
+++ b/usr/src/cmd/sgs/dump/amd64/Makefile	Tue Mar 14 09:22:52 2006 -0800
@@ -2,9 +2,8 @@
 # CDDL HEADER START
 #
 # The contents of this file are subject to the terms of the
-# Common Development and Distribution License, Version 1.0 only
-# (the "License").  You may not use this file except in compliance
-# with the License.
+# 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.
@@ -19,8 +18,9 @@
 #
 # CDDL HEADER END
 #
+
 #
-# Copyright 2004 Sun Microsystems, Inc.  All rights reserved.
+# Copyright 2006 Sun Microsystems, Inc.  All rights reserved.
 # Use is subject to license terms.
 #
 # ident	"%Z%%M%	%I%	%E% SMI"
@@ -34,12 +34,13 @@
 ELFLIBDIR =	$(ELFLIBDIR64)
 DEMLIB =	$(DEMLIB64)
 CONVLIBDIR =	$(CONVLIBDIR64)
-LINTFLAGS64 +=	-Xarch=amd64
 
 ROOTCCSBINPROG=	$(ROOTCCSBINPROG64)
 
 include		../Makefile.targ
 include		../../Makefile.sub.64
 
+lint:		$(LINTOUT64) $(SGSLINTOUT)
+
 install \
 package:	$(ROOTCCSBINPROG64)

--- a/usr/src/cmd/sgs/dump/common/dump.c	Tue Mar 14 09:14:42 2006 -0800
+++ b/usr/src/cmd/sgs/dump/common/dump.c	Tue Mar 14 09:22:52 2006 -0800
@@ -2,9 +2,8 @@
  * CDDL HEADER START
  *
  * The contents of this file are subject to the terms of the
- * Common Development and Distribution License, Version 1.0 only
- * (the "License").  You may not use this file except in compliance
- * with the License.
+ * 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.
@@ -19,14 +18,12 @@
  *
  * CDDL HEADER END
  */
+
 /*
  *	Copyright (c) 1988 AT&T
  *	  All Rights Reserved
  *
- */
-
-/*
- * Copyright 2004 Sun Microsystems, Inc.  All rights reserved.
+ * Copyright 2006 Sun Microsystems, Inc.  All rights reserved.
  * Use is subject to license terms.
  */
 
@@ -41,6 +38,7 @@
 #include <sys/elf_M32.h>
 #include <sys/elf_386.h>
 #include <sys/elf_SPARC.h>
+#include <sys/elf_amd64.h>
 #include <sys/machelf.h>
 #include <fcntl.h>
 #include <sys/stat.h>
@@ -301,7 +299,7 @@
 	int adj = 0;
 
 	if (gelf_getclass(elf_file) == ELFCLASS64)
-		adj = 4;
+		adj = 8;
 
 	rel_entsize = p_scns->p_shdr.sh_entsize;
 	if ((rel_entsize == 0) ||
@@ -400,7 +398,7 @@
 	int adj = 0;
 
 	if (gelf_getclass(elf_file) == ELFCLASS64)
-		adj = 4;
+		adj = 8;
 
 	rel_entsize = p_scns->p_shdr.sh_entsize;
 	if ((rel_entsize == 0) ||
@@ -468,12 +466,12 @@
 }
 
 /* demangle C++ names */
-static char *format = "%s\t[%s]";
 static char *
 demangled_name(char *s)
 {
-	char *dn;
-	static char *buf;
+	static char	*buf = NULL;
+	char		*dn;
+	size_t		len;
 
 	dn = sgs_demangle(s);
 
@@ -489,11 +487,11 @@
 	if (buf != NULL)
 		free(buf);
 
-	buf = malloc(strlen(dn) + 1 + 1 + strlen(s) + 1 + 1);
-	if (buf == NULL)
+	len = strlen(dn) + strlen(s) + 4;
+	if ((buf = malloc(len)) == NULL)
 		return (s);
 
-	(void) sprintf(buf, format, dn, s);
+	(void) snprintf(buf, len, "%s\t[%s]", dn, s);
 	return (buf);
 }
 
@@ -516,7 +514,7 @@
 	unsigned int	nosymshndx = 0;
 
 	if (gelf_getclass(elf_file) == ELFCLASS64)
-		adj = 4;
+		adj = 8;
 
 	while (range > 0) {
 		char		*sym_name = (char *)0;
@@ -712,7 +710,7 @@
 	int field;
 
 	if (gelf_getclass(elf_file) == ELFCLASS64)
-		field = 15;
+		field = 21;
 	else
 		field = 13;
 
@@ -798,6 +796,12 @@
 			case SHT_SUNW_COMDAT:
 				(void) printf("COMD");
 				break;
+			case SHT_AMD64_UNWIND:
+				(void) printf("UNWD");
+				break;
+			case SHT_SPARC_GOTDATA:
+				(void) printf("GOTD");
+				break;
 			default:
 				(void) printf("%u", EC_WORD(p->p_shdr.sh_type));
 				break;
@@ -903,7 +907,7 @@
 	size_t shnum;
 
 	if (gelf_getclass(elf_file) == ELFCLASS64)
-		adj = 4;
+		adj = 8;
 
 	if ((!p_flag) && (!r_title)) {
 		(void) printf("\n    **** RELOCATION INFORMATION ****\n");
@@ -1114,7 +1118,7 @@
 	int adj = 0;			/*  field adjustment for elf64 */
 
 	if (gelf_getclass(elf_file) == ELFCLASS64)
-		adj = 4;
+		adj = 8;
 
 	if (p_symtab == NULL) {
 		(void) fprintf(stderr,
@@ -1859,15 +1863,15 @@
 	int field;
 
 	if (gelf_getehdr(elf_file, elf_head_p) == NULL) {
-		(void) fprintf(stderr,
-		"%s: %s: %s\n", prog_name, filename, elf_errmsg(-1));
+		(void) fprintf(stderr, "%s: %s: %s\n", prog_name, filename,
+		    elf_errmsg(-1));
 		return (NULL);
 	}
 
 	class = (int)elf_head_p->e_ident[4];
 
 	if (class == ELFCLASS64)
-		field = 17;
+		field = 21;
 	else
 		field = 13;
 
@@ -1875,14 +1879,13 @@
 		return (elf_head_p);
 
 	if (!p_flag) {
-	(void) printf(
-		"\n                    **** ELF HEADER ****\n");
-	(void) printf("%-*s%-11s%-*sMachine     Version\n",
-	    field, "Class", "Data", field, "Type");
-	(void) printf("%-*s%-11s%-*sFlags       Ehsize\n",
-	    field, "Entry", "Phoff", field, "Shoff");
-	(void) printf("%-*s%-11s%-*sShnum       Shstrndx\n\n",
-	    field, "Phentsize", "Phnum", field, "Shentsz");
+		(void) printf("\n                    **** ELF HEADER ****\n");
+		(void) printf("%-*s%-11s%-*sMachine     Version\n",
+		    field, "Class", "Data", field, "Type");
+		(void) printf("%-*s%-11s%-*sFlags       Ehsize\n",
+		    field, "Entry", "Phoff", field, "Shoff");
+		(void) printf("%-*s%-11s%-*sShnum       Shstrndx\n\n",
+		    field, "Phentsize", "Phnum", field, "Shentsz");
 	}
 
 	if (!v_flag) {
@@ -2040,9 +2043,9 @@
 		int		field;
 
 		if (gelf_getclass(elf_file) == ELFCLASS64)
-			field = 14;
+			field = 21;
 		else
-			field = 12;
+			field = 13;
 		if (!p_flag) {
 			(void) printf("\n	   **** SECTION HEADER[0] "
 			    "{Elf Extensions} ****\n");
@@ -2051,7 +2054,7 @@
 			    field, "Addr", field, "Offset", field,
 			    "Size(shnum)",
 			    /* compatibility:  tab for elf32 */
-			    (field == 12) ? "\t" : "  ");
+			    (field == 13) ? "\t" : "  ");
 			(void) printf("\tLn(strndx) Info\t%-*s Entsize\n",
 			    field, "Adralgn");
 		}
@@ -2079,7 +2082,7 @@
 			field, EC_OFF(shdr0.sh_offset),
 			field, EC_XWORD(shdr0.sh_size),
 			/* compatibility:  tab for elf32 */
-			((field == 12) ? "\t" : "  "),
+			((field == 13) ? "\t" : "  "),
 			field, EC_WORD(shdr0.sh_name));
 
 		(void) printf("\t%u\t%u\t%-#*llx %-#*llx\n",
@@ -2231,16 +2234,16 @@
 	int found_it = 0;  /* for use with -n section_name */
 
 	if (gelf_getclass(elf_file) == ELFCLASS64)
-		field = 14;
+		field = 21;
 	else
-		field = 12;
+		field = 13;
 
 	if (!p_flag) {
 		(void) printf("\n	   **** SECTION HEADER TABLE ****\n");
 		(void) printf("[No]\tType\tFlags\t%-*s %-*s %-*s%sName\n",
 		    field, "Addr", field, "Offset", field, "Size",
 		    /* compatibility:  tab for elf32 */
-		    (field == 12) ? "\t" : "  ");
+		    (field == 13) ? "\t" : "  ");
 		(void) printf("\tLink\tInfo\t%-*s Entsize\n\n",
 		    field, "Adralgn");
 	}
@@ -2528,6 +2531,8 @@
 
 	cmd = ELF_C_READ;
 	while ((arf = elf_begin(fd, cmd, elf_file)) != 0) {
+		size_t	len;
+
 		p_ar = elf_getarhdr(arf);
 		if (p_ar == NULL) {
 			(void) fprintf(stderr,
@@ -2542,8 +2547,11 @@
 			continue;
 		}
 
-		fullname = malloc(strlen(filename) + strlen(p_ar->ar_name) + 3);
-		(void) sprintf(fullname, "%s[%s]", filename, p_ar->ar_name);
+		len = strlen(filename) + strlen(p_ar->ar_name) + 3;
+		if ((fullname = malloc(len)) == NULL)
+			return;
+		(void) snprintf(fullname, len, "%s[%s]", filename,
+		    p_ar->ar_name);
 		(void) printf("\n%s:\n", fullname);
 		file_type = elf_kind(arf);
 		if (file_type == ELF_K_ELF) {
@@ -2593,26 +2601,21 @@
 	errno = 0;
 
 	if (stat(filename, &buf) == -1) {
-		(void) fprintf(stderr, "%s: ", prog_name);
-		perror(filename);
+		int	err = errno;
+		(void) fprintf(stderr, "%s: %s: %s", prog_name, filename,
+		    strerror(err));
 		return;
 	}
 
-	if (elf_version(EV_CURRENT) == EV_NONE) {
-		(void) fprintf(stderr,
-		"%s: Libelf is out of date\n", prog_name);
-		exit(101);
-	}
-
 	if ((fd = open((filename), O_RDONLY)) == -1) {
-		(void) fprintf(stderr, "%s: %s: cannot read\n",
-			prog_name, filename);
+		(void) fprintf(stderr, "%s: %s: cannot read\n", prog_name,
+		    filename);
 		return;
 	}
 	cmd = ELF_C_READ;
 	if ((elf_file = elf_begin(fd, cmd, (Elf *)0)) == NULL) {
-		(void) fprintf(stderr,
-		"%s: %s: %s\n", prog_name, filename, elf_errmsg(-1));
+		(void) fprintf(stderr, "%s: %s: %s\n", prog_name, filename,
+		    elf_errmsg(-1));
 		return;
 	}
 
@@ -2627,24 +2630,18 @@
 	} else {
 		if (file_type == ELF_K_ELF) {
 			(void) printf("\n%s:\n", filename);
-			if (dump_elf_header(elf_file, filename, &elf_head)
-			    == (GElf_Ehdr *)0) {
-					(void) elf_end(elf_file);
-					(void) close(fd);
-					return;
+			if (dump_elf_header(elf_file, filename, &elf_head)) {
+				if (o_flag)
+					dump_exec_header(elf_file,
+					    (unsigned)elf_head.e_phnum,
+					    filename);
+				if (x_flag)
+					dump_section_table(elf_file,
+					    &elf_head, filename);
 			}
-			if (o_flag)
-				dump_exec_header(elf_file,
-					(unsigned)elf_head.e_phnum, filename);
-			if (x_flag)
-				dump_section_table(elf_file,
-					&elf_head, filename);
 		} else {
 			(void) fprintf(stderr, "%s: %s: invalid file type\n",
-				prog_name, filename);
-			(void) elf_end(elf_file);
-			(void) close(fd);
-			return;
+			    prog_name, filename);
 		}
 	}
 	(void) elf_end(elf_file);
@@ -2661,7 +2658,6 @@
 	char *optstr = OPTSTR; /* option string used by getopt() */
 	int optchar;
 
-
 	/*
 	 * Check for a binary that better fits this architecture.
 	 */
@@ -2769,6 +2765,12 @@
 		}
 	}
 
+	if (elf_version(EV_CURRENT) == EV_NONE) {
+		(void) fprintf(stderr, "%s: libelf is out of date\n",
+		    prog_name);
+		exit(101);
+	}
+
 	while (optind < argc) {
 		each_file(argv[optind]);
 		optind++;