Imported Upstream version 5.14.0.93
Former-commit-id: dda284b8de49fb65cd1a403db6a592e6c68a5e8c
This commit is contained in:
parent
fb453ffa72
commit
300ff421ef
@ -116,6 +116,9 @@
|
|||||||
/* Disable advanced SSA JIT optimizations */
|
/* Disable advanced SSA JIT optimizations */
|
||||||
#undef DISABLE_SSA
|
#undef DISABLE_SSA
|
||||||
|
|
||||||
|
/* Do not create structured crash files during unmanaged crashes */
|
||||||
|
#undef DISABLE_STRUCTURED_CRASH
|
||||||
|
|
||||||
/* Disables the verifier */
|
/* Disables the verifier */
|
||||||
#undef DISABLE_VERIFIER
|
#undef DISABLE_VERIFIER
|
||||||
|
|
||||||
@ -1182,6 +1185,9 @@
|
|||||||
/* AOT cross offsets file */
|
/* AOT cross offsets file */
|
||||||
#undef MONO_OFFSETS_FILE
|
#undef MONO_OFFSETS_FILE
|
||||||
|
|
||||||
|
/* Do not include names of unmanaged functions in the crash dump */
|
||||||
|
#undef MONO_PRIVATE_CRASHES
|
||||||
|
|
||||||
/* Reduce runtime requirements (and capabilities) */
|
/* Reduce runtime requirements (and capabilities) */
|
||||||
#undef MONO_SMALL_CONFIG
|
#undef MONO_SMALL_CONFIG
|
||||||
|
|
||||||
|
@ -1 +1 @@
|
|||||||
fa303f4752344e66680344ff3fb9e799370ebf04
|
5df36bf6767b4dc7856dd80dcc0b9b48d09fea80
|
@ -1 +1 @@
|
|||||||
eeb04e9455d7e096619d07605df365016c14a883
|
5fc828dca3fdf41143cc1f3b6afabb8ebbc1ce43
|
@ -271,6 +271,36 @@ This flag is mutually exlusive with
|
|||||||
By default the mkbundle tool will download from a Mono server the
|
By default the mkbundle tool will download from a Mono server the
|
||||||
target runtimes, you can specify a different server to provide
|
target runtimes, you can specify a different server to provide
|
||||||
cross-compiled runtimes.
|
cross-compiled runtimes.
|
||||||
|
.TP
|
||||||
|
.I "--mono-api-struct-path FILE"
|
||||||
|
FILE points to a file with the definition of the \fIBundleMonoAPI\fP structure which contains the
|
||||||
|
required pointers to various Mono API functions used throughout the generated code. This mechanism
|
||||||
|
is meant to be used by third parties which embed the Mono runtime and dynamically load and initialize
|
||||||
|
it as part of the application startup, in which case the Mono APIs will not be available for the shared
|
||||||
|
library loader and the bundle will fail to work (one example of such an embedding third party is
|
||||||
|
Xamarin.Android).
|
||||||
|
|
||||||
|
After providing the definition FILE, the embedder must call the \fIvoid initialize_mono_api (const BundleMonoAPI *info)\fP
|
||||||
|
function found in the generated code
|
||||||
|
.B before
|
||||||
|
calling \fIvoid mono_mkbundle_init ()\fP. The structure passed to \fIinitialize_mono_api\fP doesn't need
|
||||||
|
to be dynamically allocated as its contents is copied to the local structure in the generated code and no
|
||||||
|
pointer to the passed structure is retained or used after \fIinitialize_mono_api\fP returns.
|
||||||
|
|
||||||
|
The list of pointers is not documented here. Instead, please look at the \fIbundle-mono-api.inc\fP file
|
||||||
|
found in the mkbundle source directory in your Mono source tree (\fImcs/tools/mkbundle\fP) or in the Mono's
|
||||||
|
GitHub repository, https://github.com/mono/mono/blob/master/mcs/tools/mkbundle/bundle-mono-api.inc
|
||||||
|
|
||||||
|
Please note that your structure must match the one expected by your version of the Mono runtime.
|
||||||
|
|
||||||
|
The file must also define the \fImkbundle_log_error\fP function with the following signature:
|
||||||
|
|
||||||
|
.nf
|
||||||
|
static void mkbundle_log_error (const char *format, ...) {}
|
||||||
|
.fi
|
||||||
|
|
||||||
|
The function should implement logging API specific to the embedder.
|
||||||
|
|
||||||
.SH OLD EMBEDDING
|
.SH OLD EMBEDDING
|
||||||
.PP
|
.PP
|
||||||
The old embedding system compiles a small C stub that embeds the
|
The old embedding system compiles a small C stub that embeds the
|
||||||
|
@ -34,7 +34,7 @@ static class Consts
|
|||||||
// Use these assembly version constants to make code more maintainable.
|
// Use these assembly version constants to make code more maintainable.
|
||||||
//
|
//
|
||||||
|
|
||||||
public const string MonoVersion = "5.14.0.88";
|
public const string MonoVersion = "5.14.0.93";
|
||||||
public const string MonoCompany = "Mono development team";
|
public const string MonoCompany = "Mono development team";
|
||||||
public const string MonoProduct = "Mono Common Language Infrastructure";
|
public const string MonoProduct = "Mono Common Language Infrastructure";
|
||||||
public const string MonoCopyright = "(c) Various Mono authors";
|
public const string MonoCopyright = "(c) Various Mono authors";
|
||||||
|
@ -1046,6 +1046,10 @@ namespace System.Net.Sockets
|
|||||||
sockares.EndPoint = remoteEP = sockares.socket.RemapIPEndPoint (ep);
|
sockares.EndPoint = remoteEP = sockares.socket.RemapIPEndPoint (ep);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
if (!sockares.socket.CanTryAddressFamily(sockares.EndPoint.AddressFamily)) {
|
||||||
|
throw new ArgumentException(SR.net_invalidAddressList);
|
||||||
|
}
|
||||||
|
|
||||||
int error = 0;
|
int error = 0;
|
||||||
|
|
||||||
if (sockares.socket.connect_in_progress) {
|
if (sockares.socket.connect_in_progress) {
|
||||||
|
@ -6,6 +6,8 @@ using System.Text;
|
|||||||
using System.Runtime.CompilerServices;
|
using System.Runtime.CompilerServices;
|
||||||
using System.Runtime.InteropServices;
|
using System.Runtime.InteropServices;
|
||||||
|
|
||||||
|
using Mono;
|
||||||
|
|
||||||
namespace System.IO {
|
namespace System.IO {
|
||||||
|
|
||||||
class LogcatTextWriter : TextWriter {
|
class LogcatTextWriter : TextWriter {
|
||||||
@ -74,8 +76,8 @@ namespace System.IO {
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
fixed (byte *b_message = Encoding.UTF8.GetBytes(message + '\0')) {
|
using (SafeStringMarshal str = new SafeStringMarshal(message)) {
|
||||||
Log (b_message);
|
Log ((byte*) str.Value);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
@ -1 +1 @@
|
|||||||
4913525f963d43fade0e1932c0866bac8f140691
|
e0c31033cb234fbe245111fd514aa92d8fdf2932
|
@ -1 +1 @@
|
|||||||
9302768848b4854f4376a91c4929aafd6795061c
|
0918023fa07a69ea21bf62858b5e96077aa3691c
|
@ -1 +1 @@
|
|||||||
215528fef1993434fd461a57c3460f4a39899f1a
|
0f0a171716a2a2c26c59478c41d1810394a93ca6
|
@ -1 +1 @@
|
|||||||
1487b6dcbd5d53290d8bf88e9b9cbcc8d9210d29
|
b79a2601bb345aa58d09bd453fc59773b13e326c
|
@ -1 +1 @@
|
|||||||
cabe8b4cef9177c57763ca5b11abb0a1ce63d426
|
e8a3d67696f746c7f1053bee56d7678f26e7ad44
|
@ -1 +1 @@
|
|||||||
6c3985cf067e80c8f89524faba458cf7595582e1
|
2ab602ec65de544966c6b22e2cf6c2901778f977
|
@ -1 +1 @@
|
|||||||
4472801ac00c2194a791897985400daccecb1d4f
|
70e683ec01f53c43698314560eea4bb57c2aa44d
|
@ -1 +1 @@
|
|||||||
2458f1050f4d8332227229fda6ef12dc68c26268
|
dbf109dbc245a0e693d2ded6244fa5929d0055be
|
@ -1 +1 @@
|
|||||||
4913525f963d43fade0e1932c0866bac8f140691
|
e0c31033cb234fbe245111fd514aa92d8fdf2932
|
@ -1 +1 @@
|
|||||||
9302768848b4854f4376a91c4929aafd6795061c
|
0918023fa07a69ea21bf62858b5e96077aa3691c
|
@ -1 +1 @@
|
|||||||
215528fef1993434fd461a57c3460f4a39899f1a
|
0f0a171716a2a2c26c59478c41d1810394a93ca6
|
@ -1 +1 @@
|
|||||||
1487b6dcbd5d53290d8bf88e9b9cbcc8d9210d29
|
b79a2601bb345aa58d09bd453fc59773b13e326c
|
@ -1 +1 @@
|
|||||||
cabe8b4cef9177c57763ca5b11abb0a1ce63d426
|
e8a3d67696f746c7f1053bee56d7678f26e7ad44
|
Some files were not shown because too many files have changed in this diff Show More
Loading…
x
Reference in New Issue
Block a user