Imported Upstream version 5.14.0.78

Former-commit-id: 3494343bcc9ddb42b36b82dd9ae7b69e85e0229f
2018-05-10 08:37:03 +00:00
parent 74b74abd9f
commit 19234507ba
1776 changed files with 67755 additions and 31107 deletions
--- a/tools/Makefile.in
+++ b/tools/Makefile.in
@@ -83,8 +83,6 @@ DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/Makefile.am \
 	$(top_srcdir)/mkinstalldirs
 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
 am__aclocal_m4_deps = $(top_srcdir)/m4/ax_check_compile_flag.m4 \
-	$(top_srcdir)/m4/iconv.m4 $(top_srcdir)/m4/lib-ld.m4 \
-	$(top_srcdir)/m4/lib-link.m4 $(top_srcdir)/m4/lib-prefix.m4 \
 	$(top_srcdir)/m4/libtool.m4 $(top_srcdir)/m4/ltoptions.m4 \
 	$(top_srcdir)/m4/ltsugar.m4 $(top_srcdir)/m4/ltversion.m4 \
 	$(top_srcdir)/m4/lt~obsolete.m4 $(top_srcdir)/m4/nls.m4 \
@@ -253,6 +251,7 @@ G_GUINT64_FORMAT = @G_GUINT64_FORMAT@
 G_HAVE_ISO_VARARGS = @G_HAVE_ISO_VARARGS@
 HAVE_ALLOCA_H = @HAVE_ALLOCA_H@
 HAVE_MSGFMT = @HAVE_MSGFMT@
+HAVE_NINJA = @HAVE_NINJA@
 HOST_CC = @HOST_CC@
 INSTALL = @INSTALL@
 INSTALL_DATA = @INSTALL_DATA@
@@ -271,7 +270,6 @@ LIBC = @LIBC@
 LIBGC_CPPFLAGS = @LIBGC_CPPFLAGS@
 LIBGC_LIBS = @LIBGC_LIBS@
 LIBGC_STATIC_LIBS = @LIBGC_STATIC_LIBS@
-LIBICONV = @LIBICONV@
 LIBMONO_LA = @LIBMONO_LA@
 LIBOBJS = @LIBOBJS@
 LIBS = @LIBS@
@@ -285,7 +283,6 @@ LLVM_LIBS = @LLVM_LIBS@
 LN_S = @LN_S@
 LTCOMPILE = @LTCOMPILE@
 LTCXXCOMPILE = @LTCXXCOMPILE@
-LTLIBICONV = @LTLIBICONV@
 LTLIBOBJS = @LTLIBOBJS@
 MAINT = @MAINT@
 MAKEINFO = @MAKEINFO@
@@ -399,7 +396,6 @@ mkdir_p = @mkdir_p@
 mono_build_root = @mono_build_root@
 mono_cfg_dir = @mono_cfg_dir@
 mono_runtime = @mono_runtime@
-ninja = @ninja@
 oldincludedir = @oldincludedir@
 pdfdir = @pdfdir@
 prefix = @prefix@
--- a/tools/locale-builder/Makefile.in
+++ b/tools/locale-builder/Makefile.in
@@ -83,8 +83,6 @@ DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/Makefile.am \
 	$(top_srcdir)/mkinstalldirs README
 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
 am__aclocal_m4_deps = $(top_srcdir)/m4/ax_check_compile_flag.m4 \
-	$(top_srcdir)/m4/iconv.m4 $(top_srcdir)/m4/lib-ld.m4 \
-	$(top_srcdir)/m4/lib-link.m4 $(top_srcdir)/m4/lib-prefix.m4 \
 	$(top_srcdir)/m4/libtool.m4 $(top_srcdir)/m4/ltoptions.m4 \
 	$(top_srcdir)/m4/ltsugar.m4 $(top_srcdir)/m4/ltversion.m4 \
 	$(top_srcdir)/m4/lt~obsolete.m4 $(top_srcdir)/m4/nls.m4 \
@@ -193,6 +191,7 @@ G_GUINT64_FORMAT = @G_GUINT64_FORMAT@
 G_HAVE_ISO_VARARGS = @G_HAVE_ISO_VARARGS@
 HAVE_ALLOCA_H = @HAVE_ALLOCA_H@
 HAVE_MSGFMT = @HAVE_MSGFMT@
+HAVE_NINJA = @HAVE_NINJA@
 HOST_CC = @HOST_CC@
 INSTALL = @INSTALL@
 INSTALL_DATA = @INSTALL_DATA@
@@ -211,7 +210,6 @@ LIBC = @LIBC@
 LIBGC_CPPFLAGS = @LIBGC_CPPFLAGS@
 LIBGC_LIBS = @LIBGC_LIBS@
 LIBGC_STATIC_LIBS = @LIBGC_STATIC_LIBS@
-LIBICONV = @LIBICONV@
 LIBMONO_LA = @LIBMONO_LA@
 LIBOBJS = @LIBOBJS@
 LIBS = @LIBS@
@@ -225,7 +223,6 @@ LLVM_LIBS = @LLVM_LIBS@
 LN_S = @LN_S@
 LTCOMPILE = @LTCOMPILE@
 LTCXXCOMPILE = @LTCXXCOMPILE@
-LTLIBICONV = @LTLIBICONV@
 LTLIBOBJS = @LTLIBOBJS@
 MAINT = @MAINT@
 MAKEINFO = @MAKEINFO@
@@ -339,7 +336,6 @@ mkdir_p = @mkdir_p@
 mono_build_root = @mono_build_root@
 mono_cfg_dir = @mono_cfg_dir@
 mono_runtime = @mono_runtime@
-ninja = @ninja@
 oldincludedir = @oldincludedir@
 pdfdir = @pdfdir@
 prefix = @prefix@
--- a/tools/monograph/Makefile.am
+++ b/tools/monograph/Makefile.am
@@ -8,11 +8,11 @@ runtime_lib=$(top_builddir)/mono/mini/$(LIBMONO_LA) $(static_libs)
 else
 static_libs=	\
 	$(top_builddir)/mono/metadata/libmonoruntimesgen.la	\
+	$(top_builddir)/mono/sgen/libmonosgen.la	\
 	$(top_builddir)/mono/utils/libmonoutils.la \
-	$(GLIB_LIBS) $(LIBICONV) \
-	$(LIBGC_STATIC_LIBS)
+	$(GLIB_LIBS)

-runtime_lib=$(top_builddir)/mono/mini/$(LIBMONO_LA) $(static_libs)
+runtime_lib=$(static_libs)
 endif

 if DISABLE_EXECUTABLES
@@ -35,11 +35,10 @@ monograph_LDADD = \
 	$(runtime_lib)			\
 	$(GLIB_LIBS)			\
 	$(LLVM_LIBS)			\
-	$(LIBICONV)			\
 	-lm

 if HOST_DARWIN
-monograph_LDFLAGS=-framework CoreFoundation
+monograph_LDFLAGS=-framework CoreFoundation -framework Foundation
 endif

 GRAPHS=System.Object System.Enum System.Attribute System.ValueType System.Reflection.MemberInfo
--- a/tools/monograph/Makefile.in
+++ b/tools/monograph/Makefile.in
@@ -85,8 +85,6 @@ DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/Makefile.am \
 	$(top_srcdir)/mkinstalldirs $(top_srcdir)/depcomp
 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
 am__aclocal_m4_deps = $(top_srcdir)/m4/ax_check_compile_flag.m4 \
-	$(top_srcdir)/m4/iconv.m4 $(top_srcdir)/m4/lib-ld.m4 \
-	$(top_srcdir)/m4/lib-link.m4 $(top_srcdir)/m4/lib-prefix.m4 \
 	$(top_srcdir)/m4/libtool.m4 $(top_srcdir)/m4/ltoptions.m4 \
 	$(top_srcdir)/m4/ltsugar.m4 $(top_srcdir)/m4/ltversion.m4 \
 	$(top_srcdir)/m4/lt~obsolete.m4 $(top_srcdir)/m4/nls.m4 \
@@ -104,16 +102,14 @@ monograph_SOURCES = monograph.c
 monograph_OBJECTS = monograph.$(OBJEXT)
 am__DEPENDENCIES_1 =
@DISABLE_EXECUTABLES_FALSE@am__DEPENDENCIES_2 = $(top_builddir)/mono/metadata/libmonoruntimesgen.la \
+@DISABLE_EXECUTABLES_FALSE@	$(top_builddir)/mono/sgen/libmonosgen.la \
@DISABLE_EXECUTABLES_FALSE@	$(top_builddir)/mono/utils/libmonoutils.la \
-@DISABLE_EXECUTABLES_FALSE@	$(am__DEPENDENCIES_1) \
-@DISABLE_EXECUTABLES_FALSE@	$(am__DEPENDENCIES_1) \
@DISABLE_EXECUTABLES_FALSE@	$(am__DEPENDENCIES_1)
-@DISABLE_EXECUTABLES_FALSE@am__DEPENDENCIES_3 = $(top_builddir)/mono/mini/$(LIBMONO_LA) \
-@DISABLE_EXECUTABLES_FALSE@	$(am__DEPENDENCIES_2)
+@DISABLE_EXECUTABLES_FALSE@am__DEPENDENCIES_3 = $(am__DEPENDENCIES_2)
@DISABLE_EXECUTABLES_TRUE@am__DEPENDENCIES_3 = $(top_builddir)/mono/mini/$(LIBMONO_LA) \
@DISABLE_EXECUTABLES_TRUE@	$(am__DEPENDENCIES_2)
 monograph_DEPENDENCIES = $(am__DEPENDENCIES_3) $(am__DEPENDENCIES_1) \
-	$(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1)
+	$(am__DEPENDENCIES_1)
 AM_V_lt = $(am__v_lt_@AM_V@)
 am__v_lt_ = $(am__v_lt_@AM_DEFAULT_V@)
 am__v_lt_0 = --silent
@@ -254,6 +250,7 @@ G_GUINT64_FORMAT = @G_GUINT64_FORMAT@
 G_HAVE_ISO_VARARGS = @G_HAVE_ISO_VARARGS@
 HAVE_ALLOCA_H = @HAVE_ALLOCA_H@
 HAVE_MSGFMT = @HAVE_MSGFMT@
+HAVE_NINJA = @HAVE_NINJA@
 HOST_CC = @HOST_CC@
 INSTALL = @INSTALL@
 INSTALL_DATA = @INSTALL_DATA@
@@ -272,7 +269,6 @@ LIBC = @LIBC@
 LIBGC_CPPFLAGS = @LIBGC_CPPFLAGS@
 LIBGC_LIBS = @LIBGC_LIBS@
 LIBGC_STATIC_LIBS = @LIBGC_STATIC_LIBS@
-LIBICONV = @LIBICONV@
 LIBMONO_LA = @LIBMONO_LA@
 LIBOBJS = @LIBOBJS@
 LIBS = @LIBS@
@@ -286,7 +282,6 @@ LLVM_LIBS = @LLVM_LIBS@
 LN_S = @LN_S@
 LTCOMPILE = @LTCOMPILE@
 LTCXXCOMPILE = @LTCXXCOMPILE@
-LTLIBICONV = @LTLIBICONV@
 LTLIBOBJS = @LTLIBOBJS@
 MAINT = @MAINT@
 MAKEINFO = @MAKEINFO@
@@ -400,7 +395,6 @@ mkdir_p = @mkdir_p@
 mono_build_root = @mono_build_root@
 mono_cfg_dir = @mono_cfg_dir@
 mono_runtime = @mono_runtime@
-ninja = @ninja@
 oldincludedir = @oldincludedir@
 pdfdir = @pdfdir@
 prefix = @prefix@
@@ -420,13 +414,13 @@ target_vendor = @target_vendor@
 top_build_prefix = @top_build_prefix@
 top_builddir = @top_builddir@
 top_srcdir = @top_srcdir@
-@DISABLE_EXECUTABLES_FALSE@runtime_lib = $(top_builddir)/mono/mini/$(LIBMONO_LA) $(static_libs)
+@DISABLE_EXECUTABLES_FALSE@runtime_lib = $(static_libs)
@DISABLE_EXECUTABLES_TRUE@runtime_lib = $(top_builddir)/mono/mini/$(LIBMONO_LA) $(static_libs)
@DISABLE_EXECUTABLES_FALSE@static_libs = \
@DISABLE_EXECUTABLES_FALSE@	$(top_builddir)/mono/metadata/libmonoruntimesgen.la	\
+@DISABLE_EXECUTABLES_FALSE@	$(top_builddir)/mono/sgen/libmonosgen.la	\
@DISABLE_EXECUTABLES_FALSE@	$(top_builddir)/mono/utils/libmonoutils.la \
-@DISABLE_EXECUTABLES_FALSE@	$(GLIB_LIBS) $(LIBICONV) \
-@DISABLE_EXECUTABLES_FALSE@	$(LIBGC_STATIC_LIBS)
+@DISABLE_EXECUTABLES_FALSE@	$(GLIB_LIBS)

 AM_CPPFLAGS = \
 	-I$(top_srcdir)			\
@@ -436,10 +430,9 @@ monograph_LDADD = \
 	$(runtime_lib)			\
 	$(GLIB_LIBS)			\
 	$(LLVM_LIBS)			\
-	$(LIBICONV)			\
 	-lm

-@HOST_DARWIN_TRUE@monograph_LDFLAGS = -framework CoreFoundation
+@HOST_DARWIN_TRUE@monograph_LDFLAGS = -framework CoreFoundation -framework Foundation
 GRAPHS = System.Object System.Enum System.Attribute System.ValueType System.Reflection.MemberInfo
 OUT = $(GRAPHS:=.jpeg)
 all: all-am
--- a/tools/monograph/monograph.c
+++ b/tools/monograph/monograph.c
@@ -10,7 +10,10 @@
 #include "mono/metadata/mono-endian.h"
 #include "mono/metadata/appdomain.h" /* mono_init */
 #include "mono/metadata/debug-helpers.h"
+#include "mono/utils/checked-build.h"
 #include "mono/utils/mono-compiler.h"
+#include "mono/utils/mono-counters.h"
+#include "mono/utils/mono-threads.h"

 static FILE *output;
 static int include_namespace = 0;
@@ -26,9 +29,9 @@ void __nacl_suspend_thread_if_needed() {}
 static void
 output_type_edge (MonoClass *first, MonoClass *second) {
 	if (include_namespace)
-		fprintf (output, "\t\"%s.%s\" -> \"%s.%s\"\n", first->name_space, first->name, second->name_space, second->name);
+		fprintf (output, "\t\"%s.%s\" -> \"%s.%s\"\n", mono_class_get_namespace (first), mono_class_get_name (first), mono_class_get_namespace (second), mono_class_get_name (second));
 	else
-		fprintf (output, "\t\"%s\" -> \"%s\"\n", first->name, second->name);
+		fprintf (output, "\t\"%s\" -> \"%s\"\n", mono_class_get_name (first), mono_class_get_name (second));
 }

 static void
@@ -42,7 +45,7 @@ print_subtypes (MonoImage *image, MonoClass *class, int depth) {

 	t = mono_image_get_table_info (image, MONO_TABLE_TYPEDEF);
 	
-	token = mono_metadata_token_index (class->type_token);
+	token = mono_metadata_token_index (mono_class_get_type_token (class));
 	token <<= MONO_TYPEDEFORREF_BITS;
 	token |= MONO_TYPEDEFORREF_TYPEDEF;

@@ -83,7 +86,7 @@ type_graph (MonoImage *image, const char* cname) {
 	fprintf (output, "%s", graph_properties);
 	child = class;
 	/* go back and print the parents for the node as well: not sure it's a good idea */
-	for (parent = class->parent; parent; parent = parent->parent) {
+	for (parent = mono_class_get_parent (class); parent; parent = mono_class_get_parent (parent)) {
 		output_type_edge (parent, child);
 		child = parent;
 	}
@@ -119,7 +122,7 @@ interface_graph (MonoImage *image, const char* cname) {
 	fprintf (output, "digraph interface {\n");
 	fprintf (output, "%s", graph_properties);
 	/* TODO: handle inetrface defined in one image and class defined in another. */
-	token = mono_metadata_token_index (class->type_token);
+	token = mono_metadata_token_index (mono_class_get_type_token (class));
 	token <<= MONO_TYPEDEFORREF_BITS;
 	token |= MONO_TYPEDEFORREF_TYPEDEF;
 	for (i = 0; i < mono_table_info_get_rows (intf); ++i) {
@@ -133,7 +136,7 @@ interface_graph (MonoImage *image, const char* cname) {
 	}
 	fprintf (output, "}\n");
 	if (verbose && !count)
-		g_print ("No class implements %s.%s\n", class->name_space, class->name);
+		g_print ("No class implements %s.%s\n", mono_class_get_namespace (class), mono_class_get_name (class));

 }

@@ -259,7 +262,7 @@ method_stats (MonoMethod *method) {
 		case MonoInlineType:
 			if (i == MONO_CEE_CASTCLASS || i == MONO_CEE_ISINST) {
 				guint32 token = read32 (ip + 1);
-				MonoClass *k = mono_class_get (method->klass->image, token);
+				MonoClass *k = mono_class_get (mono_class_get_image (method->klass), token);
 				if (k && mono_class_get_flags (k) & TYPE_ATTRIBUTE_SEALED)
 					cast_sealed++;
 				if (k && mono_class_get_flags (k) & TYPE_ATTRIBUTE_INTERFACE)
@@ -361,7 +364,7 @@ method_stats (MonoMethod *method) {
 			break;
 		case MonoInlineMethod:
 			if (i == MONO_CEE_CALLVIRT) {
-				MonoMethod *cm = mono_get_method (method->klass->image, read32 (ip + 1), NULL);
+				MonoMethod *cm = mono_get_method (mono_class_get_image (method->klass), read32 (ip + 1), NULL);
 				if (cm && !(cm->flags & METHOD_ATTRIBUTE_VIRTUAL))
 					nonvirt_callvirt++;
 				if (cm && (mono_class_get_flags (cm->klass) & TYPE_ATTRIBUTE_INTERFACE))
@@ -434,10 +437,10 @@ type_stats (MonoClass *klass) {
 		num_ifaces++;
 		return;
 	}
-	parent = klass->parent;
+	parent = mono_class_get_parent (klass);
 	while (parent) {
 		depth++;
-		parent = parent->parent;
+		parent = mono_class_get_parent (parent);
 	}
 	if (pdepth_array_next >= pdepth_array_size) {
 		pdepth_array_size *= 2;
@@ -527,7 +530,7 @@ type_size_stats (MonoClass *klass)
 		mono_method_header_get_code (header, &size, &maxs);
 		code_size += size;
 	}
-	g_print ("%s.%s: code: %d\n", klass->name_space, klass->name, code_size);
+	g_print ("%s.%s: code: %d\n", mono_class_get_namespace (klass), mono_class_get_name (klass), code_size);
 }

 static void
@@ -555,10 +558,10 @@ get_signature (MonoMethod *method) {
 		return result;

 	res = g_string_new ("");
-	if (include_namespace && *(method->klass->name_space))
-		g_string_append_printf (res, "%s.", method->klass->name_space);
+	if (include_namespace && *mono_class_get_namespace (method->klass))
+		g_string_append_printf (res, "%s.", mono_class_get_namespace (method->klass));
 	result = mono_signature_get_desc (mono_method_signature (method), include_namespace);
-	g_string_append_printf (res, "%s:%s(%s)", method->klass->name, method->name, result);
+	g_string_append_printf (res, "%s:%s(%s)", mono_class_get_name (method->klass), method->name, result);
 	g_free (result);
 	g_hash_table_insert (hash, method, res->str);

@@ -666,7 +669,7 @@ print_method (MonoMethod *method, int depth) {
 			ip++;
 			token = read32 (ip);
 			ip += 4;
-			called = mono_get_method (method->klass->image, token, NULL);
+			called = mono_get_method (mono_class_get_image (method->klass), token, NULL);
 			if (!called)
 				break; /* warn? */
 			if (g_hash_table_lookup (hash, called))
@@ -1069,6 +1072,11 @@ enum {
 	GRAPH_STATS
 };

+static void
+thread_state_init (MonoThreadUnwindState *ctx)
+{
+}
+
 /*
 * TODO:
 * * virtual method calls as explained above
@@ -1093,6 +1101,7 @@ main (int argc, char *argv[]) {
 	int graphtype = GRAPH_TYPES;
 	int callneato = 0;
 	int i;
+	MonoThreadInfoRuntimeCallbacks ticallbacks;
 	
 	output = stdout;

@@ -1132,6 +1141,12 @@ main (int argc, char *argv[]) {
 		aname = argv [i];
 	if (argc > i + 1)
 		cname = argv [i + 1];
+	CHECKED_MONO_INIT ();
+	mono_counters_init ();
+	mono_tls_init_runtime_keys ();
+	memset (&ticallbacks, 0, sizeof (ticallbacks));
+	ticallbacks.thread_state_init = thread_state_init;
+	mono_thread_info_runtime_init (&ticallbacks);
 	if (aname) {
 		mono_init_from_assembly (argv [0], aname);
 		assembly = mono_assembly_open (aname, NULL);
--- a/tools/pedump/Makefile.am
+++ b/tools/pedump/Makefile.am
@@ -22,8 +22,7 @@ pedump_LDADD = 			\
 	$(top_builddir)/mono/utils/libmonoutils.la \
 	$(LLVM_LIBS)			\
 	$(LLVM_LDFLAGS)			\
-	$(GLIB_LIBS)			\
-	$(LIBICONV)
+	$(GLIB_LIBS)

 if HOST_DARWIN
 pedump_LDFLAGS=-framework CoreFoundation -framework Foundation
--- a/tools/pedump/Makefile.in
+++ b/tools/pedump/Makefile.in
@@ -85,8 +85,6 @@ DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/Makefile.am \
 	$(top_srcdir)/mkinstalldirs $(top_srcdir)/depcomp
 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
 am__aclocal_m4_deps = $(top_srcdir)/m4/ax_check_compile_flag.m4 \
-	$(top_srcdir)/m4/iconv.m4 $(top_srcdir)/m4/lib-ld.m4 \
-	$(top_srcdir)/m4/lib-link.m4 $(top_srcdir)/m4/lib-prefix.m4 \
 	$(top_srcdir)/m4/libtool.m4 $(top_srcdir)/m4/ltoptions.m4 \
 	$(top_srcdir)/m4/ltsugar.m4 $(top_srcdir)/m4/ltversion.m4 \
 	$(top_srcdir)/m4/lt~obsolete.m4 $(top_srcdir)/m4/nls.m4 \
@@ -108,7 +106,7 @@ pedump_DEPENDENCIES =  \
 	$(top_builddir)/mono/sgen/libmonosgen.la \
 	$(top_builddir)/mono/utils/libmonoutils.la \
 	$(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \
-	$(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1)
+	$(am__DEPENDENCIES_1)
 AM_V_lt = $(am__v_lt_@AM_V@)
 am__v_lt_ = $(am__v_lt_@AM_DEFAULT_V@)
 am__v_lt_0 = --silent
@@ -249,6 +247,7 @@ G_GUINT64_FORMAT = @G_GUINT64_FORMAT@
 G_HAVE_ISO_VARARGS = @G_HAVE_ISO_VARARGS@
 HAVE_ALLOCA_H = @HAVE_ALLOCA_H@
 HAVE_MSGFMT = @HAVE_MSGFMT@
+HAVE_NINJA = @HAVE_NINJA@
 HOST_CC = @HOST_CC@
 INSTALL = @INSTALL@
 INSTALL_DATA = @INSTALL_DATA@
@@ -267,7 +266,6 @@ LIBC = @LIBC@
 LIBGC_CPPFLAGS = @LIBGC_CPPFLAGS@
 LIBGC_LIBS = @LIBGC_LIBS@
 LIBGC_STATIC_LIBS = @LIBGC_STATIC_LIBS@
-LIBICONV = @LIBICONV@
 LIBMONO_LA = @LIBMONO_LA@
 LIBOBJS = @LIBOBJS@
 LIBS = @LIBS@
@@ -281,7 +279,6 @@ LLVM_LIBS = @LLVM_LIBS@
 LN_S = @LN_S@
 LTCOMPILE = @LTCOMPILE@
 LTCXXCOMPILE = @LTCXXCOMPILE@
-LTLIBICONV = @LTLIBICONV@
 LTLIBOBJS = @LTLIBOBJS@
 MAINT = @MAINT@
 MAKEINFO = @MAKEINFO@
@@ -395,7 +392,6 @@ mkdir_p = @mkdir_p@
 mono_build_root = @mono_build_root@
 mono_cfg_dir = @mono_cfg_dir@
 mono_runtime = @mono_runtime@
-ninja = @ninja@
 oldincludedir = @oldincludedir@
 pdfdir = @pdfdir@
 prefix = @prefix@
@@ -425,8 +421,7 @@ pedump_LDADD = \
 	$(top_builddir)/mono/utils/libmonoutils.la \
 	$(LLVM_LIBS)			\
 	$(LLVM_LDFLAGS)			\
-	$(GLIB_LIBS)			\
-	$(LIBICONV)
+	$(GLIB_LIBS)

@HOST_DARWIN_TRUE@pedump_LDFLAGS = -framework CoreFoundation -framework Foundation
 all: all-am
--- a/tools/pedump/pedump.c
+++ b/tools/pedump/pedump.c
@@ -24,6 +24,7 @@
 #include <mono/metadata/assembly-internals.h>
 #include <mono/metadata/metadata-internals.h>
 #include <mono/metadata/class-internals.h>
+#include <mono/metadata/class-init.h>
 #include <mono/metadata/verify-internals.h>
 #include <mono/metadata/marshal.h>
 #include <mono/metadata/w32handle.h>
@@ -375,7 +376,7 @@ dump_verify_info (MonoImage *image, int flags, gboolean valid_only)
 			errors = mono_method_verify (method, flags);
 			if (errors) {
 				MonoClass *klass = mono_method_get_class (method);
-				char *name = mono_type_full_name (&klass->byval_arg);
+				char *name = mono_type_full_name (m_class_get_byval_arg (klass));
 				if (mono_method_signature (method) == NULL) {
 					g_print ("In method: %s::%s(ERROR)\n", name, mono_method_get_name (method));
 				} else {
@@ -527,7 +528,7 @@ verify_image_file (const char *fname)
 		if (mono_class_has_failure (klass)) {
 			ERROR_DECL (type_load_error);
 			mono_error_set_for_class_failure (type_load_error, klass);
-			printf ("Could not initialize class(0x%08x) %s.%s due to %s\n", token, klass->name_space, klass->name, mono_error_get_message (type_load_error));
+			printf ("Could not initialize class(0x%08x) %s.%s due to %s\n", token, m_class_get_name_space (klass), m_class_get_name (klass), mono_error_get_message (type_load_error));
 			mono_error_cleanup (type_load_error);
 			++count;
 		}
@@ -536,7 +537,7 @@ verify_image_file (const char *fname)
 		if (mono_class_has_failure (klass)) {
 			ERROR_DECL (type_load_error);
 			mono_error_set_for_class_failure (type_load_error, klass);
-			printf ("Could not initialize vtable of class(0x%08x) %s.%s due to %s\n", token, klass->name_space, klass->name, mono_error_get_message (type_load_error));
+			printf ("Could not initialize vtable of class(0x%08x) %s.%s due to %s\n", token, m_class_get_name_space (klass), m_class_get_name (klass), mono_error_get_message (type_load_error));
 			mono_error_cleanup (type_load_error);
 			++count;
 		}
--- a/tools/sgen/Makefile.am
+++ b/tools/sgen/Makefile.am
@@ -16,4 +16,4 @@ sgen_grep_binprot_SOURCES = \
 	sgen-entry-stream.h

 sgen_grep_binprot_LDADD = \
-	$(GLIB_LIBS) $(LIBICONV) libsgen-grep-binprot.a libsgen-grep-binprot32p.a libsgen-grep-binprot64p.a
+	$(GLIB_LIBS) libsgen-grep-binprot.a libsgen-grep-binprot32p.a libsgen-grep-binprot64p.a
--- a/tools/sgen/Makefile.in
+++ b/tools/sgen/Makefile.in
@@ -86,8 +86,6 @@ DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/Makefile.am \
 	$(top_srcdir)/mkinstalldirs $(top_srcdir)/depcomp
 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
 am__aclocal_m4_deps = $(top_srcdir)/m4/ax_check_compile_flag.m4 \
-	$(top_srcdir)/m4/iconv.m4 $(top_srcdir)/m4/lib-ld.m4 \
-	$(top_srcdir)/m4/lib-link.m4 $(top_srcdir)/m4/lib-prefix.m4 \
 	$(top_srcdir)/m4/libtool.m4 $(top_srcdir)/m4/ltoptions.m4 \
 	$(top_srcdir)/m4/ltsugar.m4 $(top_srcdir)/m4/ltversion.m4 \
 	$(top_srcdir)/m4/lt~obsolete.m4 $(top_srcdir)/m4/nls.m4 \
@@ -129,8 +127,8 @@ am_sgen_grep_binprot_OBJECTS = sgen-grep-binprot-main.$(OBJEXT) \
 sgen_grep_binprot_OBJECTS = $(am_sgen_grep_binprot_OBJECTS)
 am__DEPENDENCIES_1 =
 sgen_grep_binprot_DEPENDENCIES = $(am__DEPENDENCIES_1) \
-	$(am__DEPENDENCIES_1) libsgen-grep-binprot.a \
-	libsgen-grep-binprot32p.a libsgen-grep-binprot64p.a
+	libsgen-grep-binprot.a libsgen-grep-binprot32p.a \
+	libsgen-grep-binprot64p.a
 AM_V_lt = $(am__v_lt_@AM_V@)
 am__v_lt_ = $(am__v_lt_@AM_DEFAULT_V@)
 am__v_lt_0 = --silent
@@ -274,6 +272,7 @@ G_GUINT64_FORMAT = @G_GUINT64_FORMAT@
 G_HAVE_ISO_VARARGS = @G_HAVE_ISO_VARARGS@
 HAVE_ALLOCA_H = @HAVE_ALLOCA_H@
 HAVE_MSGFMT = @HAVE_MSGFMT@
+HAVE_NINJA = @HAVE_NINJA@
 HOST_CC = @HOST_CC@
 INSTALL = @INSTALL@
 INSTALL_DATA = @INSTALL_DATA@
@@ -292,7 +291,6 @@ LIBC = @LIBC@
 LIBGC_CPPFLAGS = @LIBGC_CPPFLAGS@
 LIBGC_LIBS = @LIBGC_LIBS@
 LIBGC_STATIC_LIBS = @LIBGC_STATIC_LIBS@
-LIBICONV = @LIBICONV@
 LIBMONO_LA = @LIBMONO_LA@
 LIBOBJS = @LIBOBJS@
 LIBS = @LIBS@
@@ -306,7 +304,6 @@ LLVM_LIBS = @LLVM_LIBS@
 LN_S = @LN_S@
 LTCOMPILE = @LTCOMPILE@
 LTCXXCOMPILE = @LTCXXCOMPILE@
-LTLIBICONV = @LTLIBICONV@
 LTLIBOBJS = @LTLIBOBJS@
 MAINT = @MAINT@
 MAKEINFO = @MAKEINFO@
@@ -420,7 +417,6 @@ mkdir_p = @mkdir_p@
 mono_build_root = @mono_build_root@
 mono_cfg_dir = @mono_cfg_dir@
 mono_runtime = @mono_runtime@
-ninja = @ninja@
 oldincludedir = @oldincludedir@
 pdfdir = @pdfdir@
 prefix = @prefix@
@@ -454,7 +450,7 @@ sgen_grep_binprot_SOURCES = \
 	sgen-entry-stream.h

 sgen_grep_binprot_LDADD = \
-	$(GLIB_LIBS) $(LIBICONV) libsgen-grep-binprot.a libsgen-grep-binprot32p.a libsgen-grep-binprot64p.a
+	$(GLIB_LIBS) libsgen-grep-binprot.a libsgen-grep-binprot32p.a libsgen-grep-binprot64p.a

 all: all-am