Imported Upstream version 3.12.0

Former-commit-id: cf92446697332992ec36726e78eb8703e1f259d7
This commit is contained in:
Jo Shields 2015-01-13 10:44:36 +00:00
parent 8b9b85e7f5
commit 181b81b4a4
659 changed files with 12743 additions and 16300 deletions

View File

@ -494,16 +494,12 @@ Directory Roadmap
* `dis/` - CIL executable Disassembler * `dis/` - CIL executable Disassembler
* `cli/` - Common code for the JIT and the interpreter.
* `io-layer/` - The I/O layer and system abstraction for * `io-layer/` - The I/O layer and system abstraction for
emulating the .NET IO model. emulating the .NET IO model.
* `cil/` - Common Intermediate Representation, XML * `cil/` - Common Intermediate Representation, XML
definition of the CIL bytecodes. definition of the CIL bytecodes.
* `interp/` - Interpreter for CLI executables (obsolete).
* `arch/` - Architecture specific portions. * `arch/` - Architecture specific portions.
* `man/` - Manual pages for the various Mono commands and programs. * `man/` - Manual pages for the various Mono commands and programs.

View File

@ -26,7 +26,7 @@ i?86-*-linux*|i?86-apple-darwin*|x86_64-*-linux*|powerpc-*-linux*|powerpc64-*-li
|amd64-*-freebsd*|i?86-*-freebsd*|ia64-*-freebsd*|arm*-*-linux*|sparc*-*-linux*|mips*-*-linux*|x86_64-apple-darwin*|aarch64*) |amd64-*-freebsd*|i?86-*-freebsd*|ia64-*-freebsd*|arm*-*-linux*|sparc*-*-linux*|mips*-*-linux*|x86_64-apple-darwin*|aarch64*)
pic_options='-fPIC' pic_options='-fPIC'
;; ;;
?86-pc-cygwin*|i?86-pc-cygwin*) ?86-pc-cygwin*|i?86-pc-cygwin*|i?86-pc-mingw32*)
pic_options='-DDLL_EXPORT' pic_options='-DDLL_EXPORT'
;; ;;
i?86-apple-darwin*|arm-apple-darwin*) i?86-apple-darwin*|arm-apple-darwin*)

View File

@ -335,6 +335,9 @@
/* Define to 1 if you have the `getresuid' function. */ /* Define to 1 if you have the `getresuid' function. */
#undef HAVE_GETRESUID #undef HAVE_GETRESUID
/* Define to 1 if you have the `getrlimit' function. */
#undef HAVE_GETRLIMIT
/* Define to 1 if you have the `getrusage' function. */ /* Define to 1 if you have the `getrusage' function. */
#undef HAVE_GETRUSAGE #undef HAVE_GETRUSAGE
@ -761,6 +764,9 @@
/* Define to 1 if you have the <sys/poll.h> header file. */ /* Define to 1 if you have the <sys/poll.h> header file. */
#undef HAVE_SYS_POLL_H #undef HAVE_SYS_POLL_H
/* Define to 1 if you have the <sys/resource.h> header file. */
#undef HAVE_SYS_RESOURCE_H
/* Define to 1 if you have the <sys/sdt.h> header file. */ /* Define to 1 if you have the <sys/sdt.h> header file. */
#undef HAVE_SYS_SDT_H #undef HAVE_SYS_SDT_H

View File

@ -1 +1 @@
f98bd1e8bf7b203688329a408624ecaaf8192c9a 03ca165ce83cc7c3a8c992c897eb02312b51e7b8

View File

@ -1 +1 @@
6792b0c1cb1e40049a4610645db04eb603741561 5d9961ae1eab15d979b37b7a90e6507b7a79f51b

View File

@ -26,17 +26,8 @@ else
SGENPCFILE= SGENPCFILE=
endif endif
if JIT_SUPPORTED
if INTERP_SUPPORTED
pkgconfig_DATA= mono.pc mono-2.pc mint.pc dotnet.pc dotnet35.pc wcf.pc mono-nunit.pc mono-cairo.pc mono-options.pc cecil.pc monodoc.pc mono-lineeditor.pc system.web.extensions_1.0.pc \
system.web.extensions.design_1.0.pc system.web.mvc.pc system.web.mvc2.pc system.web.mvc3.pc aspnetwebstack.pc reactive.pc xbuild12.pc $(SGENPCFILE)
else
pkgconfig_DATA= mono.pc mono-2.pc dotnet.pc dotnet35.pc wcf.pc mono-nunit.pc mono-cairo.pc mono-options.pc cecil.pc monodoc.pc mono-lineeditor.pc system.web.extensions_1.0.pc \ pkgconfig_DATA= mono.pc mono-2.pc dotnet.pc dotnet35.pc wcf.pc mono-nunit.pc mono-cairo.pc mono-options.pc cecil.pc monodoc.pc mono-lineeditor.pc system.web.extensions_1.0.pc \
system.web.extensions.design_1.0.pc system.web.mvc.pc system.web.mvc2.pc system.web.mvc3.pc aspnetwebstack.pc reactive.pc xbuild12.pc $(SGENPCFILE) system.web.extensions.design_1.0.pc system.web.mvc.pc system.web.mvc2.pc system.web.mvc3.pc aspnetwebstack.pc reactive.pc xbuild12.pc $(SGENPCFILE)
endif
else
pkgconfig_DATA= mint.pc mono-nunit.pc mono-cairo.pc mono-options.pc cecil.pc monodoc.pc mono-lineeditor.pc
endif
DISTCLEANFILES= mono-2.pc mono.pc mint.pc dotnet.pc dotnet35.pc wcf.pc mono-nunit.pc mono-cairo.pc mono-options.pc cecil.pc monodoc.pc mono-lineeditor.pc system.web.extensions_1.0.pc \ DISTCLEANFILES= mono-2.pc mono.pc mint.pc dotnet.pc dotnet35.pc wcf.pc mono-nunit.pc mono-cairo.pc mono-options.pc cecil.pc monodoc.pc mono-lineeditor.pc system.web.extensions_1.0.pc \
system.web.extensions.design_1.0.pc system.web.mvc.pc system.web.mvc2.pc system.web.mvc3.pc aspnetwebstack.pc reactive.pc $(SGENPCFILE) mono-sgen-gdb.py system.web.extensions.design_1.0.pc system.web.mvc.pc system.web.mvc2.pc system.web.mvc3.pc aspnetwebstack.pc reactive.pc $(SGENPCFILE) mono-sgen-gdb.py

View File

@ -447,13 +447,9 @@ EXTRA_DIST = \
pkgconfigdir = $(libdir)/pkgconfig pkgconfigdir = $(libdir)/pkgconfig
@SUPPORT_SGEN_FALSE@SGENPCFILE = @SUPPORT_SGEN_FALSE@SGENPCFILE =
@SUPPORT_SGEN_TRUE@SGENPCFILE = monosgen-2.pc @SUPPORT_SGEN_TRUE@SGENPCFILE = monosgen-2.pc
@INTERP_SUPPORTED_FALSE@@JIT_SUPPORTED_TRUE@pkgconfig_DATA = mono.pc mono-2.pc dotnet.pc dotnet35.pc wcf.pc mono-nunit.pc mono-cairo.pc mono-options.pc cecil.pc monodoc.pc mono-lineeditor.pc system.web.extensions_1.0.pc \ pkgconfig_DATA = mono.pc mono-2.pc dotnet.pc dotnet35.pc wcf.pc mono-nunit.pc mono-cairo.pc mono-options.pc cecil.pc monodoc.pc mono-lineeditor.pc system.web.extensions_1.0.pc \
@INTERP_SUPPORTED_FALSE@@JIT_SUPPORTED_TRUE@ system.web.extensions.design_1.0.pc system.web.mvc.pc system.web.mvc2.pc system.web.mvc3.pc aspnetwebstack.pc reactive.pc xbuild12.pc $(SGENPCFILE) system.web.extensions.design_1.0.pc system.web.mvc.pc system.web.mvc2.pc system.web.mvc3.pc aspnetwebstack.pc reactive.pc xbuild12.pc $(SGENPCFILE)
@INTERP_SUPPORTED_TRUE@@JIT_SUPPORTED_TRUE@pkgconfig_DATA = mono.pc mono-2.pc mint.pc dotnet.pc dotnet35.pc wcf.pc mono-nunit.pc mono-cairo.pc mono-options.pc cecil.pc monodoc.pc mono-lineeditor.pc system.web.extensions_1.0.pc \
@INTERP_SUPPORTED_TRUE@@JIT_SUPPORTED_TRUE@ system.web.extensions.design_1.0.pc system.web.mvc.pc system.web.mvc2.pc system.web.mvc3.pc aspnetwebstack.pc reactive.pc xbuild12.pc $(SGENPCFILE)
@JIT_SUPPORTED_FALSE@pkgconfig_DATA = mint.pc mono-nunit.pc mono-cairo.pc mono-options.pc cecil.pc monodoc.pc mono-lineeditor.pc
DISTCLEANFILES = mono-2.pc mono.pc mint.pc dotnet.pc dotnet35.pc wcf.pc mono-nunit.pc mono-cairo.pc mono-options.pc cecil.pc monodoc.pc mono-lineeditor.pc system.web.extensions_1.0.pc \ DISTCLEANFILES = mono-2.pc mono.pc mint.pc dotnet.pc dotnet35.pc wcf.pc mono-nunit.pc mono-cairo.pc mono-options.pc cecil.pc monodoc.pc mono-lineeditor.pc system.web.extensions_1.0.pc \
system.web.extensions.design_1.0.pc system.web.mvc.pc system.web.mvc2.pc system.web.mvc3.pc aspnetwebstack.pc reactive.pc $(SGENPCFILE) mono-sgen-gdb.py system.web.extensions.design_1.0.pc system.web.mvc.pc system.web.mvc2.pc system.web.mvc3.pc aspnetwebstack.pc reactive.pc $(SGENPCFILE) mono-sgen-gdb.py

View File

@ -10,7 +10,7 @@
<dllmap dll="i:odbc32.dll" target="libiodbc.dylib" os="osx"/> <dllmap dll="i:odbc32.dll" target="libiodbc.dylib" os="osx"/>
<dllmap dll="oci" target="libclntsh@libsuffix@" os="!windows"/> <dllmap dll="oci" target="libclntsh@libsuffix@" os="!windows"/>
<dllmap dll="db2cli" target="libdb2_36@libsuffix@" os="!windows"/> <dllmap dll="db2cli" target="libdb2_36@libsuffix@" os="!windows"/>
<dllmap dll="MonoPosixHelper" target="@prefix@/lib/libMonoPosixHelper@libsuffix@" os="!windows" /> <dllmap dll="MonoPosixHelper" target="@prefix@/@reloc_libdir@/libMonoPosixHelper@libsuffix@" os="!windows" />
<dllmap dll="i:msvcrt" target="@LIBC@" os="!windows"/> <dllmap dll="i:msvcrt" target="@LIBC@" os="!windows"/>
<dllmap dll="i:msvcrt.dll" target="@LIBC@" os="!windows"/> <dllmap dll="i:msvcrt.dll" target="@LIBC@" os="!windows"/>
<dllmap dll="sqlite" target="@SQLITE@" os="!windows"/> <dllmap dll="sqlite" target="@SQLITE@" os="!windows"/>

View File

@ -125,7 +125,7 @@ mono_class_from_name_case (MonoImage *image, const char* name_space, const char
</div> </div>
<p /> <p />
<b>Parameters</b> <b>Parameters</b>
<blockquote><dt><i>image:</i></dt><dd> The MonoImage where the type is looked up in</dd><dt><i>name_space:</i></dt><dd> the type namespace</dd><dt><i>name:</i></dt><dd> the type short name.</dd></blockquote> <blockquote><dt><i>image:</i></dt><dd> The MonoImage where the type is looked up in</dd><dt><i>name_space:</i></dt><dd> the type namespace</dd><dt><i>name:</i></dt><dd> the type short name.</dd><dt><i>deprecated:</i></dt><dd> use the _checked variant</dd></blockquote>
<b>Remarks</b> <b>Remarks</b>
<p /> <p />
Obtains a MonoClass with a given namespace and a given name which Obtains a MonoClass with a given namespace and a given name which
@ -332,7 +332,7 @@ mono_class_get_full (MonoImage *image, guint32 type_token, MonoGenericContext *c
</div> </div>
<p /> <p />
<b>Parameters</b> <b>Parameters</b>
<blockquote><dt><i>image:</i></dt><dd> the image where the class resides</dd><dt><i>type_token:</i></dt><dd> the token for the class</dd><dt><i>context:</i></dt><dd> the generic context used to evaluate generic instantiations in</dd></blockquote> <blockquote><dt><i>image:</i></dt><dd> the image where the class resides</dd><dt><i>type_token:</i></dt><dd> the token for the class</dd><dt><i>context:</i></dt><dd> the generic context used to evaluate generic instantiations in</dd><dt><i>deprecated:</i></dt><dd> Functions that expose MonoGenericContext are going away in mono 4.0</dd></blockquote>
<b>Returns</b> <b>Returns</b>
<blockquote> the MonoClass that represents <i>type_token</i> in <i>image</i> <blockquote> the MonoClass that represents <i>type_token</i> in <i>image</i>
</blockquote> </blockquote>

View File

@ -26,7 +26,7 @@ i?86-*-linux*|i?86-apple-darwin*|x86_64-*-linux*|powerpc-*-linux*|powerpc64-*-li
|amd64-*-freebsd*|i?86-*-freebsd*|ia64-*-freebsd*|arm*-*-linux*|sparc*-*-linux*|mips*-*-linux*|x86_64-apple-darwin*|aarch64*) |amd64-*-freebsd*|i?86-*-freebsd*|ia64-*-freebsd*|arm*-*-linux*|sparc*-*-linux*|mips*-*-linux*|x86_64-apple-darwin*|aarch64*)
pic_options='-fPIC' pic_options='-fPIC'
;; ;;
?86-pc-cygwin*|i?86-pc-cygwin*) ?86-pc-cygwin*|i?86-pc-cygwin*|i?86-pc-mingw32*)
pic_options='-DDLL_EXPORT' pic_options='-DDLL_EXPORT'
;; ;;
i?86-apple-darwin*|arm-apple-darwin*) i?86-apple-darwin*|arm-apple-darwin*)

View File

@ -12,6 +12,9 @@
/* Define to 1 if you have the `getpwuid_r' function. */ /* Define to 1 if you have the `getpwuid_r' function. */
#undef HAVE_GETPWUID_R #undef HAVE_GETPWUID_R
/* Define to 1 if you have the `getrlimit' function. */
#undef HAVE_GETRLIMIT
/* Define if you have the iconv() function and it works. */ /* Define if you have the iconv() function and it works. */
#undef HAVE_ICONV #undef HAVE_ICONV
@ -60,6 +63,9 @@
/* Define to 1 if you have the `strtok_r' function. */ /* Define to 1 if you have the `strtok_r' function. */
#undef HAVE_STRTOK_R #undef HAVE_STRTOK_R
/* Define to 1 if you have the <sys/resource.h> header file. */
#undef HAVE_SYS_RESOURCE_H
/* Define to 1 if you have the <sys/select.h> header file. */ /* Define to 1 if you have the <sys/select.h> header file. */
#undef HAVE_SYS_SELECT_H #undef HAVE_SYS_SELECT_H

View File

@ -1 +1 @@
8efa2ac8877cc4d116d3625738612cdba7e474a4 f63e8c4f995b49470fb7c4bd1f34dac0e85ad20c

View File

@ -135,6 +135,7 @@ AC_CHECK_SIZEOF(void *)
AC_CHECK_SIZEOF(long) AC_CHECK_SIZEOF(long)
AC_CHECK_SIZEOF(long long) AC_CHECK_SIZEOF(long long)
AC_CHECK_FUNCS(strlcpy stpcpy strtok_r rewinddir vasprintf) AC_CHECK_FUNCS(strlcpy stpcpy strtok_r rewinddir vasprintf)
AC_CHECK_FUNCS(getrlimit)
# #
# Mono currently supports 10.6, but strndup is not available prior to 10.7; avoiding # Mono currently supports 10.6, but strndup is not available prior to 10.7; avoiding
@ -179,7 +180,7 @@ if test "x$have_iso_varargs" = "xyes"; then
fi fi
AC_SUBST(G_HAVE_ISO_VARARGS) AC_SUBST(G_HAVE_ISO_VARARGS)
AC_CHECK_HEADERS(getopt.h sys/select.h sys/time.h sys/wait.h pwd.h langinfo.h iconv.h localcharset.h sys/types.h) AC_CHECK_HEADERS(getopt.h sys/select.h sys/time.h sys/wait.h pwd.h langinfo.h iconv.h localcharset.h sys/types.h sys/resource.h)
AC_CHECK_HEADER(alloca.h, [HAVE_ALLOCA_H=1], [HAVE_ALLOCA_H=0]) AC_CHECK_HEADER(alloca.h, [HAVE_ALLOCA_H=1], [HAVE_ALLOCA_H=0])
AC_SUBST(HAVE_ALLOCA_H) AC_SUBST(HAVE_ALLOCA_H)

View File

@ -176,7 +176,6 @@ typedef struct _GMemChunk GMemChunk;
/* /*
* Misc. * Misc.
*/ */
#define g_atexit(func) ((void) atexit (func))
const gchar * g_getenv(const gchar *variable); const gchar * g_getenv(const gchar *variable);
gboolean g_setenv(const gchar *variable, const gchar *value, gboolean overwrite); gboolean g_setenv(const gchar *variable, const gchar *value, gboolean overwrite);

View File

@ -176,7 +176,7 @@ default_stderr_handler (const gchar *message)
} }
#elif MONOTOUCH #elif defined(HOST_IOS)
#include <asl.h> #include <asl.h>
static int static int

View File

@ -53,6 +53,10 @@
#include <sys/wait.h> #include <sys/wait.h>
#endif #endif
#ifdef HAVE_SYS_RESOURCE_H
# include <sys/resource.h>
#endif
#ifdef G_OS_WIN32 #ifdef G_OS_WIN32
#include <io.h> #include <io.h>
#include <winsock2.h> #include <winsock2.h>
@ -213,6 +217,23 @@ write_all (int fd, const void *vbuf, size_t n)
return nwritten; return nwritten;
} }
#ifndef G_OS_WIN32
static int
g_getdtablesize (void)
{
#ifdef HAVE_GETRLIMIT
struct rlimit limit;
int res;
res = getrlimit (RLIMIT_NOFILE, &limit);
g_assert (res == 0);
return limit.rlim_cur;
#else
return getdtablesize ();
#endif
}
#endif
gboolean gboolean
g_spawn_command_line_sync (const gchar *command_line, g_spawn_command_line_sync (const gchar *command_line,
gchar **standard_output, gchar **standard_output,
@ -256,7 +277,7 @@ g_spawn_command_line_sync (const gchar *command_line,
close (stderr_pipe [0]); close (stderr_pipe [0]);
dup2 (stderr_pipe [1], STDERR_FILENO); dup2 (stderr_pipe [1], STDERR_FILENO);
} }
for (i = getdtablesize () - 1; i >= 3; i--) for (i = g_getdtablesize () - 1; i >= 3; i--)
close (i); close (i);
/* G_SPAWN_SEARCH_PATH is always enabled for g_spawn_command_line_sync */ /* G_SPAWN_SEARCH_PATH is always enabled for g_spawn_command_line_sync */
@ -417,7 +438,7 @@ g_spawn_async_with_pipes (const gchar *working_directory,
} }
if ((flags & G_SPAWN_LEAVE_DESCRIPTORS_OPEN) != 0) { if ((flags & G_SPAWN_LEAVE_DESCRIPTORS_OPEN) != 0) {
for (i = getdtablesize () - 1; i >= 3; i--) for (i = g_getdtablesize () - 1; i >= 3; i--)
close (i); close (i);
} }

View File

@ -1,6 +1,10 @@
/* config.h. Generated by configure. */ /* config.h. Generated by configure. */
/* config.h.in. Generated from configure.ac by autoheader. */ /* config.h.in. Generated from configure.ac by autoheader. */
#ifndef _MSC_VER
#include "cygconfig.h"
#else
/* Define to 1 if you have the <dlfcn.h> header file. */ /* Define to 1 if you have the <dlfcn.h> header file. */
#define HAVE_DLFCN_H 1 #define HAVE_DLFCN_H 1
@ -74,3 +78,4 @@
#define VERSION "0.1" #define VERSION "0.1"
#define HAVE_STRTOK_R 1 #define HAVE_STRTOK_R 1
#endif

View File

@ -26,7 +26,7 @@ i?86-*-linux*|i?86-apple-darwin*|x86_64-*-linux*|powerpc-*-linux*|powerpc64-*-li
|amd64-*-freebsd*|i?86-*-freebsd*|ia64-*-freebsd*|arm*-*-linux*|sparc*-*-linux*|mips*-*-linux*|x86_64-apple-darwin*|aarch64*) |amd64-*-freebsd*|i?86-*-freebsd*|ia64-*-freebsd*|arm*-*-linux*|sparc*-*-linux*|mips*-*-linux*|x86_64-apple-darwin*|aarch64*)
pic_options='-fPIC' pic_options='-fPIC'
;; ;;
?86-pc-cygwin*|i?86-pc-cygwin*) ?86-pc-cygwin*|i?86-pc-cygwin*|i?86-pc-mingw32*)
pic_options='-DDLL_EXPORT' pic_options='-DDLL_EXPORT'
;; ;;
i?86-apple-darwin*|arm-apple-darwin*) i?86-apple-darwin*|arm-apple-darwin*)

View File

@ -1 +1 @@
8f066765940517df1ea0554208196aab32b6b19b 2f526024d2da61894c7ed648a1207722cbb90688

View File

@ -1075,19 +1075,10 @@ first generation (of two). A larger nursery will usually speed up the
program but will obviously use more memory. The default nursery size program but will obviously use more memory. The default nursery size
4 MB. 4 MB.
.TP .TP
\fBmajor=\fIcollector\fR \fBmajor=\fIcollector\fR Specifies which major collector to use.
Specifies which major collector to use. Options are `marksweep' for Options are `marksweep' for the Mark&Sweep collector, and
the Mark&Sweep collector, `marksweep-conc' for concurrent Mark&Sweep, `marksweep-conc' for concurrent Mark&Sweep. The non-concurrent
`marksweep-par' for parallel Mark&Sweep, `marksweep-fixed' for Mark&Sweep collector is the default.
Mark&Sweep with a fixed heap, and `marksweep-fixed-par' for parallel
Mark&Sweep with a fixed heap. The Mark&Sweep collector is the default.
.TP
\fBmajor-heap-size=\fIsize\fR
Sets the size of the major heap (not including the large object space)
for the fixed-heap Mark&Sweep collector (i.e. `marksweep-fixed' and
`marksweep-fixed-par'). The size is in bytes, with optional suffixes
`k', `m' and `g' to specify kilo-, mega- and gigabytes, respectively.
The default is 512 megabytes.
.TP .TP
\fBsoft-heap-limit=\fIsize\fR \fBsoft-heap-limit=\fIsize\fR
Once the heap size gets larger than this size, ignore what the default Once the heap size gets larger than this size, ignore what the default
@ -1266,6 +1257,11 @@ work, Mono needs to be compiled with the BINARY_PROTOCOL define on
sgen-gc.c. You can then use this command to explore the output sgen-gc.c. You can then use this command to explore the output
.nf .nf
sgen-grep-binprot 0x1234 0x5678 < file sgen-grep-binprot 0x1234 0x5678 < file
.TP
\fBnursery-canaries\fR
If set, objects allocated in the nursery are suffixed with a canary (guard)
word, which is checked on each minor collection. Can be used to detect/debug
heap corruption issues.
.fi .fi
.ne .ne
.RE .RE

Some files were not shown because too many files have changed in this diff Show More