Imported Upstream version 5.16.0.100

Former-commit-id: 38faa55fb9669e35e7d8448b15c25dc447f25767
This commit is contained in:
Xamarin Public Jenkins (auto-signing)
2018-08-07 15:19:03 +00:00
parent 0a9828183b
commit 7d7f676260
4419 changed files with 170950 additions and 90273 deletions

View File

@@ -229,26 +229,17 @@ EXEEXT = @EXEEXT@
FGREP = @FGREP@
GDKX11 = @GDKX11@
GETTEXT_MACRO_VERSION = @GETTEXT_MACRO_VERSION@
GINT_TO_POINTER = @GINT_TO_POINTER@
GLIB_CFLAGS = @GLIB_CFLAGS@
GLIB_LIBS = @GLIB_LIBS@
GMSGFMT = @GMSGFMT@
GMSGFMT_015 = @GMSGFMT_015@
GNUC_NORETURN = @GNUC_NORETURN@
GNUC_PRETTY = @GNUC_PRETTY@
GNUC_UNUSED = @GNUC_UNUSED@
GPOINTER_TO_INT = @GPOINTER_TO_INT@
GPOINTER_TO_UINT = @GPOINTER_TO_UINT@
GREP = @GREP@
GSIZE = @GSIZE@
GSIZE_FORMAT = @GSIZE_FORMAT@
GSSIZE = @GSSIZE@
GTKX11 = @GTKX11@
GUINT_TO_POINTER = @GUINT_TO_POINTER@
G_GINT32_FORMAT = @G_GINT32_FORMAT@
G_GINT64_FORMAT = @G_GINT64_FORMAT@
G_GUINT32_FORMAT = @G_GUINT32_FORMAT@
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@

View File

@@ -169,26 +169,17 @@ EXEEXT = @EXEEXT@
FGREP = @FGREP@
GDKX11 = @GDKX11@
GETTEXT_MACRO_VERSION = @GETTEXT_MACRO_VERSION@
GINT_TO_POINTER = @GINT_TO_POINTER@
GLIB_CFLAGS = @GLIB_CFLAGS@
GLIB_LIBS = @GLIB_LIBS@
GMSGFMT = @GMSGFMT@
GMSGFMT_015 = @GMSGFMT_015@
GNUC_NORETURN = @GNUC_NORETURN@
GNUC_PRETTY = @GNUC_PRETTY@
GNUC_UNUSED = @GNUC_UNUSED@
GPOINTER_TO_INT = @GPOINTER_TO_INT@
GPOINTER_TO_UINT = @GPOINTER_TO_UINT@
GREP = @GREP@
GSIZE = @GSIZE@
GSIZE_FORMAT = @GSIZE_FORMAT@
GSSIZE = @GSSIZE@
GTKX11 = @GTKX11@
GUINT_TO_POINTER = @GUINT_TO_POINTER@
G_GINT32_FORMAT = @G_GINT32_FORMAT@
G_GINT64_FORMAT = @G_GINT64_FORMAT@
G_GUINT32_FORMAT = @G_GUINT32_FORMAT@
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@

View File

@@ -3,6 +3,8 @@ if HOST_WIN32
export HOST_CC
endif
glib_libs = $(top_builddir)/mono/eglib/libeglib.la
if DISABLE_EXECUTABLES
runtime_lib=$(top_builddir)/mono/mini/$(LIBMONO_LA) $(static_libs)
else
@@ -10,7 +12,7 @@ static_libs= \
$(top_builddir)/mono/metadata/libmonoruntimesgen.la \
$(top_builddir)/mono/sgen/libmonosgen.la \
$(top_builddir)/mono/utils/libmonoutils.la \
$(GLIB_LIBS)
$(glib_libs)
runtime_lib=$(static_libs)
endif
@@ -33,9 +35,8 @@ AM_CPPFLAGS = \
monograph_LDADD = \
$(runtime_lib) \
$(GLIB_LIBS) \
$(LLVM_LIBS) \
-lm
$(glib_libs) \
$(LLVM_LIBS)
if HOST_DARWIN
monograph_LDFLAGS=-framework CoreFoundation -framework Foundation

View File

@@ -101,14 +101,7 @@ PROGRAMS = $(bin_PROGRAMS)
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_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) \
monograph_DEPENDENCIES = $(runtime_lib) $(glib_libs) \
$(am__DEPENDENCIES_1)
AM_V_lt = $(am__v_lt_@AM_V@)
am__v_lt_ = $(am__v_lt_@AM_DEFAULT_V@)
@@ -228,26 +221,17 @@ EXEEXT = @EXEEXT@
FGREP = @FGREP@
GDKX11 = @GDKX11@
GETTEXT_MACRO_VERSION = @GETTEXT_MACRO_VERSION@
GINT_TO_POINTER = @GINT_TO_POINTER@
GLIB_CFLAGS = @GLIB_CFLAGS@
GLIB_LIBS = @GLIB_LIBS@
GMSGFMT = @GMSGFMT@
GMSGFMT_015 = @GMSGFMT_015@
GNUC_NORETURN = @GNUC_NORETURN@
GNUC_PRETTY = @GNUC_PRETTY@
GNUC_UNUSED = @GNUC_UNUSED@
GPOINTER_TO_INT = @GPOINTER_TO_INT@
GPOINTER_TO_UINT = @GPOINTER_TO_UINT@
GREP = @GREP@
GSIZE = @GSIZE@
GSIZE_FORMAT = @GSIZE_FORMAT@
GSSIZE = @GSSIZE@
GTKX11 = @GTKX11@
GUINT_TO_POINTER = @GUINT_TO_POINTER@
G_GINT32_FORMAT = @G_GINT32_FORMAT@
G_GINT64_FORMAT = @G_GINT64_FORMAT@
G_GUINT32_FORMAT = @G_GUINT32_FORMAT@
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@
@@ -414,13 +398,14 @@ target_vendor = @target_vendor@
top_build_prefix = @top_build_prefix@
top_builddir = @top_builddir@
top_srcdir = @top_srcdir@
glib_libs = $(top_builddir)/mono/eglib/libeglib.la
@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)
@DISABLE_EXECUTABLES_FALSE@ $(glib_libs)
AM_CPPFLAGS = \
-I$(top_srcdir) \
@@ -428,9 +413,8 @@ AM_CPPFLAGS = \
monograph_LDADD = \
$(runtime_lib) \
$(GLIB_LIBS) \
$(LLVM_LIBS) \
-lm
$(glib_libs) \
$(LLVM_LIBS)
@HOST_DARWIN_TRUE@monograph_LDFLAGS = -framework CoreFoundation -framework Foundation
GRAPHS = System.Object System.Enum System.Attribute System.ValueType System.Reflection.MemberInfo

View File

@@ -1,6 +1,8 @@
AM_CPPFLAGS = -I$(top_srcdir) -I$(top_srcdir)/mono $(LIBGC_CPPFLAGS) $(GLIB_CFLAGS) $(SHARED_CFLAGS)
glib_libs = $(top_builddir)/mono/eglib/libeglib.la
if DISABLE_EXECUTABLES
bin_PROGRAMS =
else
@@ -22,7 +24,7 @@ pedump_LDADD = \
$(top_builddir)/mono/utils/libmonoutils.la \
$(LLVM_LIBS) \
$(LLVM_LDFLAGS) \
$(GLIB_LIBS)
$(glib_libs)
if HOST_DARWIN
pedump_LDFLAGS=-framework CoreFoundation -framework Foundation
@@ -31,4 +33,4 @@ endif
#Helper target to rebuild metadata as well, it's useful when working on the verifier as its source still on metadata
md:
make -C ../../mono/metadata all
make -C . all
make -C . all

View File

@@ -105,8 +105,7 @@ pedump_DEPENDENCIES = \
$(top_builddir)/mono/metadata/libmonoruntimesgen.la \
$(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) $(glib_libs)
AM_V_lt = $(am__v_lt_@AM_V@)
am__v_lt_ = $(am__v_lt_@AM_DEFAULT_V@)
am__v_lt_0 = --silent
@@ -225,26 +224,17 @@ EXEEXT = @EXEEXT@
FGREP = @FGREP@
GDKX11 = @GDKX11@
GETTEXT_MACRO_VERSION = @GETTEXT_MACRO_VERSION@
GINT_TO_POINTER = @GINT_TO_POINTER@
GLIB_CFLAGS = @GLIB_CFLAGS@
GLIB_LIBS = @GLIB_LIBS@
GMSGFMT = @GMSGFMT@
GMSGFMT_015 = @GMSGFMT_015@
GNUC_NORETURN = @GNUC_NORETURN@
GNUC_PRETTY = @GNUC_PRETTY@
GNUC_UNUSED = @GNUC_UNUSED@
GPOINTER_TO_INT = @GPOINTER_TO_INT@
GPOINTER_TO_UINT = @GPOINTER_TO_UINT@
GREP = @GREP@
GSIZE = @GSIZE@
GSIZE_FORMAT = @GSIZE_FORMAT@
GSSIZE = @GSSIZE@
GTKX11 = @GTKX11@
GUINT_TO_POINTER = @GUINT_TO_POINTER@
G_GINT32_FORMAT = @G_GINT32_FORMAT@
G_GINT64_FORMAT = @G_GINT64_FORMAT@
G_GUINT32_FORMAT = @G_GUINT32_FORMAT@
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@
@@ -412,6 +402,7 @@ top_build_prefix = @top_build_prefix@
top_builddir = @top_builddir@
top_srcdir = @top_srcdir@
AM_CPPFLAGS = -I$(top_srcdir) -I$(top_srcdir)/mono $(LIBGC_CPPFLAGS) $(GLIB_CFLAGS) $(SHARED_CFLAGS)
glib_libs = $(top_builddir)/mono/eglib/libeglib.la
pedump_SOURCES = \
pedump.c
@@ -421,7 +412,7 @@ pedump_LDADD = \
$(top_builddir)/mono/utils/libmonoutils.la \
$(LLVM_LIBS) \
$(LLVM_LDFLAGS) \
$(GLIB_LIBS)
$(glib_libs)
@HOST_DARWIN_TRUE@pedump_LDFLAGS = -framework CoreFoundation -framework Foundation
all: all-am

View File

@@ -31,6 +31,7 @@
#include "mono/utils/mono-digest.h"
#include <mono/utils/mono-mmap.h>
#include <mono/utils/mono-counters.h>
#include <mono/utils/mono-error-internals.h>
#include <sys/types.h>
#include <sys/stat.h>
#ifdef HAVE_UNISTD_H
@@ -422,15 +423,13 @@ usage (void)
static int
verify_image_file (const char *fname)
{
GSList *errors = NULL, *tmp;
ERROR_DECL (error);
MonoImage *image;
MonoTableInfo *table;
MonoAssembly *assembly;
MonoImageOpenStatus status;
int i, count = 0;
const char* desc [] = {
"Ok", "Error", "Warning", NULL, "CLS", NULL, NULL, NULL, "Not Verifiable"
};
if (!strstr (fname, "mscorlib.dll")) {
image = mono_image_open_raw (fname, &status);
@@ -439,7 +438,7 @@ verify_image_file (const char *fname)
return 1;
}
if (!mono_verifier_verify_pe_data (image, &errors))
if (!mono_verifier_verify_pe_data (image, error))
goto invalid_image;
if (!mono_image_load_pe_data (image)) {
@@ -447,7 +446,7 @@ verify_image_file (const char *fname)
return 1;
}
if (!mono_verifier_verify_cli_data (image, &errors))
if (!mono_verifier_verify_cli_data (image, error))
goto invalid_image;
if (!mono_image_load_cli_data (image)) {
@@ -455,7 +454,7 @@ verify_image_file (const char *fname)
return 1;
}
if (!mono_verifier_verify_table_data (image, &errors))
if (!mono_verifier_verify_table_data (image, error))
goto invalid_image;
mono_image_load_names (image);
@@ -490,7 +489,7 @@ verify_image_file (const char *fname)
mono_marshal_init ();
image = mono_get_corlib ();
if (!mono_verifier_verify_pe_data (image, &errors))
if (!mono_verifier_verify_pe_data (image, error))
goto invalid_image;
if (!mono_image_load_pe_data (image)) {
@@ -498,7 +497,7 @@ verify_image_file (const char *fname)
return 1;
}
if (!mono_verifier_verify_cli_data (image, &errors))
if (!mono_verifier_verify_cli_data (image, error))
goto invalid_image;
if (!mono_image_load_cli_data (image)) {
@@ -506,11 +505,11 @@ verify_image_file (const char *fname)
return 1;
}
if (!mono_verifier_verify_table_data (image, &errors))
if (!mono_verifier_verify_table_data (image, error))
goto invalid_image;
}
if (!verify_partial_md && !mono_verifier_verify_full_table_data (image, &errors))
if (!verify_partial_md && !mono_verifier_verify_full_table_data (image, error))
goto invalid_image;
@@ -547,13 +546,11 @@ verify_image_file (const char *fname)
return 0;
invalid_image:
for (tmp = errors; tmp; tmp = tmp->next) {
MonoVerifyInfo *info = (MonoVerifyInfo *)tmp->data;
g_print ("%s: %s\n", desc [info->status], info->message);
if (info->status == MONO_VERIFY_ERROR)
count++;
if (!is_ok (error)) {
g_print ("FAIL: %s\n", mono_error_get_message (error));
mono_error_cleanup (error);
++count;
}
mono_free_verify_list (errors);
if (count)
g_print ("Error count: %d\n", count);
return 1;
@@ -568,7 +565,7 @@ try_load_from (MonoAssembly **assembly, const gchar *path1, const gchar *path2,
*assembly = NULL;
fullpath = g_build_filename (path1, path2, path3, path4, NULL);
if (g_file_test (fullpath, G_FILE_TEST_IS_REGULAR))
*assembly = mono_assembly_open_predicate (fullpath, refonly, FALSE, NULL, NULL, NULL);
*assembly = mono_assembly_open_predicate (fullpath, refonly ? MONO_ASMCTX_REFONLY : MONO_ASMCTX_DEFAULT, NULL, NULL, NULL, NULL);
g_free (fullpath);
return (*assembly != NULL);
@@ -794,7 +791,7 @@ main (int argc, char *argv [])
mono_verifier_set_mode (verifier_mode);
assembly = mono_assembly_open_predicate (file, FALSE, FALSE, NULL, NULL, NULL);
assembly = mono_assembly_open_predicate (file, MONO_ASMCTX_DEFAULT, NULL, NULL, NULL, NULL);
/*fake an assembly for netmodules so the verifier works*/
if (!assembly && (image = mono_image_open (file, &status)) && image->tables [MONO_TABLE_ASSEMBLY].rows == 0) {
assembly = g_new0 (MonoAssembly, 1);

View File

@@ -2,6 +2,8 @@ bin_PROGRAMS = sgen-grep-binprot
AM_CPPFLAGS = $(GLIB_CFLAGS) -I$(top_srcdir)
glib_libs = $(top_builddir)/mono/eglib/libeglib.la
noinst_LIBRARIES = libsgen-grep-binprot.a libsgen-grep-binprot32p.a libsgen-grep-binprot64p.a
libsgen_grep_binprot_a_SOURCES = sgen-grep-binprot.c sgen-grep-binprot.h
libsgen_grep_binprot_a_CPPFLAGS = $(GLIB_CFLAGS) -I$(top_srcdir)
@@ -16,4 +18,4 @@ sgen_grep_binprot_SOURCES = \
sgen-entry-stream.h
sgen_grep_binprot_LDADD = \
$(GLIB_LIBS) 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

View File

@@ -125,10 +125,8 @@ PROGRAMS = $(bin_PROGRAMS)
am_sgen_grep_binprot_OBJECTS = sgen-grep-binprot-main.$(OBJEXT) \
sgen-entry-stream.$(OBJEXT)
sgen_grep_binprot_OBJECTS = $(am_sgen_grep_binprot_OBJECTS)
am__DEPENDENCIES_1 =
sgen_grep_binprot_DEPENDENCIES = $(am__DEPENDENCIES_1) \
libsgen-grep-binprot.a libsgen-grep-binprot32p.a \
libsgen-grep-binprot64p.a
sgen_grep_binprot_DEPENDENCIES = $(glib_libs) 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
@@ -250,26 +248,17 @@ EXEEXT = @EXEEXT@
FGREP = @FGREP@
GDKX11 = @GDKX11@
GETTEXT_MACRO_VERSION = @GETTEXT_MACRO_VERSION@
GINT_TO_POINTER = @GINT_TO_POINTER@
GLIB_CFLAGS = @GLIB_CFLAGS@
GLIB_LIBS = @GLIB_LIBS@
GMSGFMT = @GMSGFMT@
GMSGFMT_015 = @GMSGFMT_015@
GNUC_NORETURN = @GNUC_NORETURN@
GNUC_PRETTY = @GNUC_PRETTY@
GNUC_UNUSED = @GNUC_UNUSED@
GPOINTER_TO_INT = @GPOINTER_TO_INT@
GPOINTER_TO_UINT = @GPOINTER_TO_UINT@
GREP = @GREP@
GSIZE = @GSIZE@
GSIZE_FORMAT = @GSIZE_FORMAT@
GSSIZE = @GSSIZE@
GTKX11 = @GTKX11@
GUINT_TO_POINTER = @GUINT_TO_POINTER@
G_GINT32_FORMAT = @G_GINT32_FORMAT@
G_GINT64_FORMAT = @G_GINT64_FORMAT@
G_GUINT32_FORMAT = @G_GUINT32_FORMAT@
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@
@@ -437,6 +426,7 @@ top_build_prefix = @top_build_prefix@
top_builddir = @top_builddir@
top_srcdir = @top_srcdir@
AM_CPPFLAGS = $(GLIB_CFLAGS) -I$(top_srcdir)
glib_libs = $(top_builddir)/mono/eglib/libeglib.la
noinst_LIBRARIES = libsgen-grep-binprot.a libsgen-grep-binprot32p.a libsgen-grep-binprot64p.a
libsgen_grep_binprot_a_SOURCES = sgen-grep-binprot.c sgen-grep-binprot.h
libsgen_grep_binprot_a_CPPFLAGS = $(GLIB_CFLAGS) -I$(top_srcdir)
@@ -450,7 +440,7 @@ sgen_grep_binprot_SOURCES = \
sgen-entry-stream.h
sgen_grep_binprot_LDADD = \
$(GLIB_LIBS) 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