6316708 LD_DEBUG should provide a means of identifying/isolating individual

        link-map lists
6280209 elfdump cores on memory model 0x3
6197234 elfdump and dump don't handle 64-bit symbols correctly

--HG--
rename : usr/src/cmd/sgs/libelf/spec/Makefile => deleted_files/usr/src/cmd/sgs/libelf/spec/Makefile
rename : usr/src/cmd/sgs/libelf/spec/Makefile.targ => deleted_files/usr/src/cmd/sgs/libelf/spec/Makefile.targ
rename : usr/src/cmd/sgs/libelf/spec/amd64/Makefile => deleted_files/usr/src/cmd/sgs/libelf/spec/amd64/Makefile
rename : usr/src/cmd/sgs/libelf/spec/elf.spec => deleted_files/usr/src/cmd/sgs/libelf/spec/elf.spec
rename : usr/src/cmd/sgs/libelf/spec/elf32.spec => deleted_files/usr/src/cmd/sgs/libelf/spec/elf32.spec
rename : usr/src/cmd/sgs/libelf/spec/elf64.spec => deleted_files/usr/src/cmd/sgs/libelf/spec/elf64.spec
rename : usr/src/cmd/sgs/libelf/spec/gelf.spec => deleted_files/usr/src/cmd/sgs/libelf/spec/gelf.spec
rename : usr/src/cmd/sgs/libelf/spec/i386/Makefile => deleted_files/usr/src/cmd/sgs/libelf/spec/i386/Makefile
rename : usr/src/cmd/sgs/libelf/spec/sparc/Makefile => deleted_files/usr/src/cmd/sgs/libelf/spec/sparc/Makefile
rename : usr/src/cmd/sgs/libelf/spec/sparcv9/Makefile => deleted_files/usr/src/cmd/sgs/libelf/spec/sparcv9/Makefile
rename : usr/src/cmd/sgs/libelf/spec/versions => deleted_files/usr/src/cmd/sgs/libelf/spec/versions
rename : usr/src/cmd/sgs/libelf/spec/weak.spec => deleted_files/usr/src/cmd/sgs/libelf/spec/weak.spec
rename : usr/src/cmd/sgs/librtld_db/common/lintsup.c => deleted_files/usr/src/cmd/sgs/librtld_db/common/lintsup.c
rename : usr/src/cmd/sgs/libld/amd64/machrel.c => usr/src/cmd/sgs/libld/common/machrel.amd.c
rename : usr/src/cmd/sgs/libld/i386/machrel.c => usr/src/cmd/sgs/libld/common/machrel.intel.c
rename : usr/src/cmd/sgs/libld/sparc/machrel.c => usr/src/cmd/sgs/libld/common/machrel.sparc.c
rename : usr/src/cmd/sgs/libld/i386/machsym.c => usr/src/cmd/sgs/libld/common/machsym.intel.c
rename : usr/src/cmd/sgs/libld/sparc/machsym.c => usr/src/cmd/sgs/libld/common/machsym.sparc.c
rename : usr/src/cmd/sgs/libld/amd64/amd64unwind.c => usr/src/cmd/sgs/libld/common/unwind.amd.c
rename : usr/src/cmd/sgs/librtld_db/common/librtld_db.sparc.msg => usr/src/cmd/sgs/librtld_db/common/librtld_db.sparcv9.msg
rename : usr/src/cmd/sgs/rtld/common/sunwmove.c => usr/src/cmd/sgs/rtld/common/move.c

3 files changed, 16 insertions, 17 deletions

diff --git a/usr/src/uts/intel/ia32/krtld/doreloc.c b/usr/src/uts/intel/ia32/krtld/doreloc.c
index 4ea9cff31f..0fc1d362a3 100644
--- a/usr/src/uts/intel/ia32/krtld/doreloc.c
+++ b/usr/src/uts/intel/ia32/krtld/doreloc.c
@@ -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.
@@ -21,7 +20,7 @@
  */
 
 /*
- * Copyright 2005 Sun Microsystems, Inc.  All rights reserved.
+ * Copyright 2006 Sun Microsystems, Inc.  All rights reserved.
  * Use is subject to license terms.
  */
 
@@ -161,9 +160,10 @@ const Rel_entry	reloc_table[R_386_NUM] = {
  * been performed before calling this function except for the addition of
  * the addresses in the instructions.
  */
+/* ARGSUSED5 */
 int
 do_reloc(uchar_t rtype, uchar_t *off, Xword *value, const char *sym,
-    const char *file)
+    const char *file, void *lml)
 {
 	const Rel_entry	*rep;
 
@@ -186,7 +186,7 @@ do_reloc(uchar_t rtype, uchar_t *off, Xword *value, const char *sym,
 		/*
 		 * To keep chkmsg() happy: MSG_INTL(MSG_REL_UNSUPSZ)
 		 */
-		REL_ERR_UNSUPSZ(file, sym, rtype, rep->re_fsize);
+		REL_ERR_UNSUPSZ(lml, file, sym, rtype, rep->re_fsize);
 		return (0);
 	}
 	return (1);
diff --git a/usr/src/uts/intel/ia32/krtld/kobj_convrelstr.c b/usr/src/uts/intel/ia32/krtld/kobj_convrelstr.c
index da12eabc25..afd55669e2 100644
--- a/usr/src/uts/intel/ia32/krtld/kobj_convrelstr.c
+++ b/usr/src/uts/intel/ia32/krtld/kobj_convrelstr.c
@@ -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.
@@ -21,7 +20,7 @@
  */
 
 /*
- * Copyright 2005 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"
@@ -61,7 +60,7 @@ static const char	*rels[R_386_NUM] = {
  * the relocation to it's full syntax.
  */
 const char *
-conv_reloc_386_type_str(uint_t type)
+conv_reloc_386_type(Word type)
 {
 	static char 	strbuf[32];
 	int		ndx = 31;
diff --git a/usr/src/uts/intel/ia32/krtld/kobj_reloc.c b/usr/src/uts/intel/ia32/krtld/kobj_reloc.c
index 87d7b720eb..547bf9ce9c 100644
--- a/usr/src/uts/intel/ia32/krtld/kobj_reloc.c
+++ b/usr/src/uts/intel/ia32/krtld/kobj_reloc.c
@@ -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.
  */
 
@@ -177,7 +177,7 @@ do_relocate(struct module *mp, char *reltbl, Word relshtype, int nreloc,
 			symp = (Sym *)
 				(mp->symtbl+(stndx * mp->symhdr->sh_entsize));
 			_kobj_printf(ops, "krtld:\t%s",
-				conv_reloc_386_type_str(rtype));
+				conv_reloc_386_type(rtype));
 			_kobj_printf(ops, "\t0x%8x", off);
 			_kobj_printf(ops, "  %s\n",
 			    (const char *)mp->strings + symp->st_name);
@@ -260,7 +260,7 @@ do_relocate(struct module *mp, char *reltbl, Word relshtype, int nreloc,
 
 		if (do_reloc(rtype, (unsigned char *)off, (Word *)&value,
 		    (const char *)mp->strings + symref->st_name,
-		    mp->filename) == 0)
+		    mp->filename, 0) == 0)
 			err = 1;
 
 	} /* end of while loop */