Revert "OS-7270 ctfconvert doesn't handle DW_AT_specification": breaks build

Reviewed by: Ryan Zezeski <rpz@joyent.com>
Approved by: Ryan Zezeski <rpz@joyent.com>

3 files changed, 27 insertions, 68 deletions

diff --git a/usr/src/lib/libctf/Makefile.shared.com b/usr/src/lib/libctf/Makefile.shared.com
index 3f2603a29a..55f090e7f8 100644
--- a/usr/src/lib/libctf/Makefile.shared.com
+++ b/usr/src/lib/libctf/Makefile.shared.com
@@ -22,7 +22,7 @@
 # Copyright 2006 Sun Microsystems, Inc.  All rights reserved.
 # Use is subject to license terms.
 #
-# Copyright 2018 Joyent, Inc.
+# Copyright (c) 2015, Joyent, Inc.  All rights reserved.
 #
 
 #
@@ -69,16 +69,16 @@ SRCS = \
 	$(LIB_OBJS:%.o=$(SRC)/lib/libctf/common/%.c) \
 	$(LIST_OBJS:%.o=$(SRC)/common/list/%.c) \
 	$(MERGEQ_OBJS:%.o=$(SRC)/lib/mergeq/%.c)
-
+	
 LIBS = $(DYNLIB) $(LINTLIB)
 LDLIBS += -lc -lelf -ldwarf -lavl
 
-CSTD = $(CSTD_GNU99)
-C99LMODE = -Xc99=%all
+C99MODE=	-xc99=%all
+C99LMODE=	-Xc99=%all
 
 SRCDIR = $(SRC)/lib/libctf/common
 
-CPPFLAGS +=	-I$(SRC)/lib/libctf/common	\
+CPPFLAGS +=	-I$(SRC)/lib/libctf/common 	\
 		-I$(SRC)/common/ctf		\
 		-I$(SRC)/lib/libdwarf/common	\
 		-I$(SRC)/lib/mergeq		\
diff --git a/usr/src/lib/libctf/common/ctf_dwarf.c b/usr/src/lib/libctf/common/ctf_dwarf.c
index f490c8f351..13a049d243 100644
--- a/usr/src/lib/libctf/common/ctf_dwarf.c
+++ b/usr/src/lib/libctf/common/ctf_dwarf.c
@@ -469,7 +469,7 @@ ctf_dwarf_refdie(ctf_die_t *cdp, Dwarf_Die die, Dwarf_Half name,
 	Dwarf_Off off;
 	Dwarf_Error derr;
 
-	if ((ret = ctf_dwarf_ref(cdp, die, name, &off)) != 0)
+	if ((ret = ctf_dwarf_ref(cdp, die, DW_AT_type, &off)) != 0)
 		return (ret);
 
 	off += cdp->cd_cuoff;
@@ -630,17 +630,6 @@ ctf_dwarf_offset(ctf_die_t *cdp, Dwarf_Die die, Dwarf_Off *offsetp)
 	return (ECTF_CONVBKERR);
 }
 
-/* simpler variant for debugging output */
-static Dwarf_Off
-ctf_die_offset(Dwarf_Die die)
-{
-	Dwarf_Off off = -1;
-	Dwarf_Error derr;
-
-	(void) dwarf_dieoffset(die, &off, &derr);
-	return (off);
-}
-
 static int
 ctf_dwarf_tag(ctf_die_t *cdp, Dwarf_Die die, Dwarf_Half *tagp)
 {
@@ -1558,6 +1547,7 @@ ctf_dwarf_create_enum(ctf_die_t *cdp, Dwarf_Die die, ctf_id_t *idp, int isroot)
 	if ((ret = ctf_dwmap_add(cdp, id, die, B_FALSE)) != 0)
 		return (ret);
 
+
 	if ((ret = ctf_dwarf_child(cdp, die, &child)) != 0) {
 		if (ret == ENOENT)
 			ret = 0;
@@ -1584,35 +1574,27 @@ ctf_dwarf_create_enum(ctf_die_t *cdp, Dwarf_Die die, ctf_id_t *idp, int isroot)
 			continue;
 		}
 
-		/*
-		 * DWARF v4 section 5.7 tells us we'll always have names.
-		 */
-		if ((ret = ctf_dwarf_string(cdp, arg, DW_AT_name, &name)) != 0)
-			return (ret);
-
-		/*
-		 * We have to be careful here: newer GCCs generate DWARF where
-		 * an unsigned value will happily pass ctf_dwarf_signed().
-		 * Since negative values will fail ctf_dwarf_unsigned(), we try
-		 * that first to make sure we get the right value.
-		 */
-		if ((ret = ctf_dwarf_unsigned(cdp, arg, DW_AT_const_value,
-		    &uval)) == 0) {
-			eval = (int)uval;
-		} else if ((ret = ctf_dwarf_signed(cdp, arg, DW_AT_const_value,
+		if ((ret = ctf_dwarf_signed(cdp, arg, DW_AT_const_value,
 		    &sval)) == 0) {
 			eval = sval;
-		}
-
-		if (ret != 0) {
-			if (ret != ENOENT)
-				return (ret);
-
+		} else if (ret != ENOENT) {
+			return (ret);
+		} else if ((ret = ctf_dwarf_unsigned(cdp, arg,
+		    DW_AT_const_value, &uval)) == 0) {
+			eval = (int)uval;
+		} else {
 			(void) snprintf(cdp->cd_errbuf, cdp->cd_errlen,
-			    "encountered enumeration without constant value\n");
+			    "encountered enumration without constant value\n");
 			return (ECTF_CONVBKERR);
 		}
 
+		/*
+		 * DWARF v4 section 5.7 tells us we'll always have names.
+		 */
+		if ((ret = ctf_dwarf_string(cdp, arg, DW_AT_name,
+		    &name)) != 0)
+			return (ret);
+
 		ret = ctf_add_enumerator(cdp->cd_ctfp, id, name, eval);
 		if (ret == CTF_ERR) {
 			(void) snprintf(cdp->cd_errbuf, cdp->cd_errlen,
@@ -2013,31 +1995,11 @@ ctf_dwarf_convert_variable(ctf_die_t *cdp, Dwarf_Die die)
 	ctf_id_t id;
 	ctf_dwvar_t *cdv;
 
-	/* Skip "Non-Defining Declarations" */
-	if ((ret = ctf_dwarf_boolean(cdp, die, DW_AT_declaration, &b)) == 0) {
-		if (b != 0)
-			return (0);
-	} else if (ret != ENOENT) {
-		return (ret);
-	}
-
-	/*
-	 * If we find a DIE of "Declarations Completing Non-Defining
-	 * Declarations", we will use the referenced type's DIE.  This isn't
-	 * quite correct, e.g. DW_AT_decl_line will be the forward declaration
-	 * not this site.  It's sufficient for what we need, however: in
-	 * particular, we should find DW_AT_external as needed there.
-	 */
-	if ((ret = ctf_dwarf_refdie(cdp, die, DW_AT_specification,
-	    &tdie)) == 0) {
-		Dwarf_Off offset;
-		if ((ret = ctf_dwarf_offset(cdp, tdie, &offset)) != 0)
+	if ((ret = ctf_dwarf_boolean(cdp, die, DW_AT_declaration, &b)) != 0) {
+		if (ret != ENOENT)
 			return (ret);
-		ctf_dprintf("die 0x%llx DW_AT_specification -> die 0x%llx\n",
-		    ctf_die_offset(die), ctf_die_offset(tdie));
-		die = tdie;
-	} else if (ret != ENOENT) {
-		return (ret);
+	} else if (b != 0) {
+		return (0);
 	}
 
 	if ((ret = ctf_dwarf_string(cdp, die, DW_AT_name, &name)) != 0 &&
diff --git a/usr/src/lib/libctf/common/mapfile-vers b/usr/src/lib/libctf/common/mapfile-vers
index f64eb407df..cfd2952bbe 100644
--- a/usr/src/lib/libctf/common/mapfile-vers
+++ b/usr/src/lib/libctf/common/mapfile-vers
@@ -23,7 +23,7 @@
 #
 
 #
-# Copyright 2018 Joyent, Inc.
+# Copyright (c) 2015, Joyent, Inc.  All rights reserved.
 #
 
 #
@@ -91,7 +91,6 @@ SYMBOL_VERSION SUNWprivate_1.2 {
 	ctf_label_info;
 	ctf_label_iter;
 	ctf_label_topmost;
-	ctf_max_id;
 	ctf_member_info;
 	ctf_merge_add;
 	ctf_merge_dedup;
@@ -101,7 +100,6 @@ SYMBOL_VERSION SUNWprivate_1.2 {
 	ctf_merge_merge;
 	ctf_merge_set_nthreads;
 	ctf_merge_uniquify;
-	ctf_nr_syms;
 	ctf_object_iter;
 	ctf_parent_file;
 	ctf_parent_label;
@@ -113,7 +111,6 @@ SYMBOL_VERSION SUNWprivate_1.2 {
 	ctf_symbol_name;
 	ctf_type_align;
 	ctf_type_cmp;
-	ctf_type_cname;
 	ctf_type_compat;
 	ctf_type_pointer;
 	ctf_update;