From owner-svn-src-vendor@FreeBSD.ORG  Sun Aug 19 09:17:21 2012
Return-Path: <owner-svn-src-vendor@FreeBSD.ORG>
Delivered-To: svn-src-vendor@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52])
	by hub.freebsd.org (Postfix) with ESMTP id E89C0106564A;
	Sun, 19 Aug 2012 09:17:21 +0000 (UTC) (envelope-from mm@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c])
	by mx1.freebsd.org (Postfix) with ESMTP id B99A28FC0C;
	Sun, 19 Aug 2012 09:17:21 +0000 (UTC)
Received: from svn.freebsd.org (localhost [127.0.0.1])
	by svn.freebsd.org (8.14.4/8.14.4) with ESMTP id q7J9HLON056369;
	Sun, 19 Aug 2012 09:17:21 GMT (envelope-from mm@svn.freebsd.org)
Received: (from mm@localhost)
	by svn.freebsd.org (8.14.4/8.14.4/Submit) id q7J9HL7l056367;
	Sun, 19 Aug 2012 09:17:21 GMT (envelope-from mm@svn.freebsd.org)
Message-Id: <201208190917.q7J9HL7l056367@svn.freebsd.org>
From: Martin Matuska <mm@FreeBSD.org>
Date: Sun, 19 Aug 2012 09:17:21 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
	svn-src-vendor@freebsd.org
X-SVN-Group: vendor
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Cc: 
Subject: svn commit: r239384 - vendor/illumos/dist/tools/ctf/cvt
X-BeenThere: svn-src-vendor@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: SVN commit messages for the vendor work area tree
	<svn-src-vendor.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-vendor>, 
	<mailto:svn-src-vendor-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-vendor>
List-Post: <mailto:svn-src-vendor@freebsd.org>
List-Help: <mailto:svn-src-vendor-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-vendor>,
	<mailto:svn-src-vendor-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Sun, 19 Aug 2012 09:17:22 -0000

Author: mm
Date: Sun Aug 19 09:17:21 2012
New Revision: 239384
URL: http://svn.freebsd.org/changeset/base/239384

Log:
  Update vendor/illumos to illumos-gate 13754:7231b684c18b
  
  References:
    https://www.illumos.org/issues/2978
  
  Obtained from:	ssh://anonhg@hg.illumos.org/illumos-gate

Modified:
  vendor/illumos/dist/tools/ctf/cvt/dwarf.c

Modified: vendor/illumos/dist/tools/ctf/cvt/dwarf.c
==============================================================================
--- vendor/illumos/dist/tools/ctf/cvt/dwarf.c	Sun Aug 19 08:16:13 2012	(r239383)
+++ vendor/illumos/dist/tools/ctf/cvt/dwarf.c	Sun Aug 19 09:17:21 2012	(r239384)
@@ -1839,21 +1839,53 @@ die_resolve(dwarf_t *dw)
 }
 
 /*
- * Any object containing at least one allocatable section of non-0 size is
- * taken to be a file which should contain DWARF type information
+ * Any object containing a function or object symbol at any scope should also
+ * contain DWARF data.
  */
 static boolean_t
 should_have_dwarf(Elf *elf)
 {
 	Elf_Scn *scn = NULL;
+	Elf_Data *data = NULL;
+	GElf_Shdr shdr;
+	GElf_Sym sym;
+	uint32_t symdx = 0;
+	size_t nsyms = 0;
+	boolean_t found = B_FALSE;
 
 	while ((scn = elf_nextscn(elf, scn)) != NULL) {
-		GElf_Shdr shdr;
 		gelf_getshdr(scn, &shdr);
 
-		if ((shdr.sh_flags & SHF_ALLOC) &&
-		    (shdr.sh_size != 0))
-			return (B_TRUE);
+		if (shdr.sh_type == SHT_SYMTAB) {
+			found = B_TRUE;
+			break;
+		}
+	}
+
+	if (!found)
+		terminate("cannot convert stripped objects\n");
+
+	data = elf_getdata(scn, NULL);
+	nsyms = shdr.sh_size / shdr.sh_entsize;
+
+	for (symdx = 0; symdx < nsyms; symdx++) {
+		gelf_getsym(data, symdx, &sym);
+
+		if ((GELF_ST_TYPE(sym.st_info) == STT_FUNC) ||
+		    (GELF_ST_TYPE(sym.st_info) == STT_TLS) ||
+		    (GELF_ST_TYPE(sym.st_info) == STT_OBJECT)) {
+			char *name;
+
+			name = elf_strptr(elf, shdr.sh_link, sym.st_name);
+
+			/* Studio emits these local symbols regardless */
+			if ((strcmp(name, "Bbss.bss") != 0) &&
+			    (strcmp(name, "Ttbss.bss") != 0) &&
+			    (strcmp(name, "Ddata.data") != 0) &&
+			    (strcmp(name, "Ttdata.data") != 0) &&
+			    (strcmp(name, "Drodata.rodata") != 0))
+				return (B_TRUE);
+		}
 	}
 
 	return (B_FALSE);