Imported Upstream version 6.6.0.123
Former-commit-id: b23bd22f7d18a697237446a84eea92f73ae923ec
This commit is contained in:
Xamarin Public Jenkins (auto-signing)
parent
999c53a9b4
commit
dfcb8ecdef
@ -1 +1 @@
|
||||
6e3c4811ade49d003f84eede9b4c021e1b80b98b
|
||||
f8b9aae84d66abdcff1d925684d1228e216c7cbf
|
||||
@ -1 +1 @@
|
||||
c50e2cfabcd9c9d6897460a876dd79552e2f3394
|
||||
0f989de83e5558b7e9b97d44265e5d10dde97788
|
||||
@ -41,7 +41,7 @@ static partial class Consts
|
||||
// Use these assembly version constants to make code more maintainable.
|
||||
//
|
||||
|
||||
public const string MonoVersion = "6.6.0.121";
|
||||
public const string MonoVersion = "6.6.0.123";
|
||||
public const string MonoCompany = "Mono development team";
|
||||
public const string MonoProduct = "Mono Common Language Infrastructure";
|
||||
public const string MonoCopyright = "(c) Various Mono authors";
|
||||
|
||||
@ -1 +1 @@
|
||||
03aa3be101b19caea4495f98a429c1b417d49e23
|
||||
d59938ae4c7fb78071fddd308fafede5a7759365
|
||||
@ -1 +1 @@
|
||||
0642431843fc8daeec9c6848fac04da3fb5a2ad5
|
||||
5ba2e0e748a09592a0600ef20116faf8258b2118
|
||||
@ -1 +1 @@
|
||||
bb5ea6ff06acd1c513ca3251e12ce944e43414fa
|
||||
3811921ca6055d6d02525834df85e1b2495d1b07
|
||||
@ -1 +1 @@
|
||||
ff78b30b11a77d7a1194a23c1a033d61622c932c
|
||||
1ac474df12181d5acd1cf7d11f27390046057634
|
||||
@ -1 +1 @@
|
||||
5d9a0af640d7e4e68702e356ac1c5364f43804c0
|
||||
7e0980369bff5d3ac0c02eface7aa7fb87353d4d
|
||||
@ -1 +1 @@
|
||||
21d684ba7228f6dfd5a076b1113c3dfa72bde87a
|
||||
107b463b2adb5356e895b7a720851db33a86c6df
|
||||
@ -1 +1 @@
|
||||
fe78243973f077054d92ebd4604dfe2e8a3da6a7
|
||||
ba129c1550a2f772601ff3a5fd92d47722a06a11
|
||||
@ -1 +1 @@
|
||||
03aa3be101b19caea4495f98a429c1b417d49e23
|
||||
d59938ae4c7fb78071fddd308fafede5a7759365
|
||||
@ -1 +1 @@
|
||||
0642431843fc8daeec9c6848fac04da3fb5a2ad5
|
||||
5ba2e0e748a09592a0600ef20116faf8258b2118
|
||||
@ -1 +1 @@
|
||||
bb5ea6ff06acd1c513ca3251e12ce944e43414fa
|
||||
3811921ca6055d6d02525834df85e1b2495d1b07
|
||||
@ -1 +1 @@
|
||||
ff78b30b11a77d7a1194a23c1a033d61622c932c
|
||||
1ac474df12181d5acd1cf7d11f27390046057634
|
||||
@ -1 +1 @@
|
||||
5d9a0af640d7e4e68702e356ac1c5364f43804c0
|
||||
7e0980369bff5d3ac0c02eface7aa7fb87353d4d
|
||||
@ -1 +1 @@
|
||||
21d684ba7228f6dfd5a076b1113c3dfa72bde87a
|
||||
107b463b2adb5356e895b7a720851db33a86c6df
|
||||
@ -1 +1 @@
|
||||
e16d6224dcb22afb80cc5b911adafded076efefa
|
||||
9ccb57c3c41dcacffdfcf7b5f9fa0784369d5bcb
|
||||
@ -1 +1 @@
|
||||
fe78243973f077054d92ebd4604dfe2e8a3da6a7
|
||||
ba129c1550a2f772601ff3a5fd92d47722a06a11
|
||||
@ -1 +1 @@
|
||||
03aa3be101b19caea4495f98a429c1b417d49e23
|
||||
d59938ae4c7fb78071fddd308fafede5a7759365
|
||||
@ -1 +1 @@
|
||||
0642431843fc8daeec9c6848fac04da3fb5a2ad5
|
||||
5ba2e0e748a09592a0600ef20116faf8258b2118
|
||||
@ -1 +1 @@
|
||||
bb5ea6ff06acd1c513ca3251e12ce944e43414fa
|
||||
3811921ca6055d6d02525834df85e1b2495d1b07
|
||||
@ -1 +1 @@
|
||||
ff78b30b11a77d7a1194a23c1a033d61622c932c
|
||||
1ac474df12181d5acd1cf7d11f27390046057634
|
||||
@ -1 +1 @@
|
||||
5d9a0af640d7e4e68702e356ac1c5364f43804c0
|
||||
7e0980369bff5d3ac0c02eface7aa7fb87353d4d
|
||||
@ -1 +1 @@
|
||||
21d684ba7228f6dfd5a076b1113c3dfa72bde87a
|
||||
107b463b2adb5356e895b7a720851db33a86c6df
|
||||
@ -1 +1 @@
|
||||
e16d6224dcb22afb80cc5b911adafded076efefa
|
||||
9ccb57c3c41dcacffdfcf7b5f9fa0784369d5bcb
|
||||
@ -1 +1 @@
|
||||
fe78243973f077054d92ebd4604dfe2e8a3da6a7
|
||||
ba129c1550a2f772601ff3a5fd92d47722a06a11
|
||||
@ -1 +1 @@
|
||||
03aa3be101b19caea4495f98a429c1b417d49e23
|
||||
d59938ae4c7fb78071fddd308fafede5a7759365
|
||||
@ -1 +1 @@
|
||||
0642431843fc8daeec9c6848fac04da3fb5a2ad5
|
||||
5ba2e0e748a09592a0600ef20116faf8258b2118
|
||||
@ -1 +1 @@
|
||||
5af86d1d9d0aa183f91206601f0de2eb248fe081
|
||||
53bfedd7e6c66dfc7c02e17c96be722880dc2c85
|
||||
@ -1 +1 @@
|
||||
ff78b30b11a77d7a1194a23c1a033d61622c932c
|
||||
1ac474df12181d5acd1cf7d11f27390046057634
|
||||
@ -1 +1 @@
|
||||
5d9a0af640d7e4e68702e356ac1c5364f43804c0
|
||||
7e0980369bff5d3ac0c02eface7aa7fb87353d4d
|
||||
@ -1 +1 @@
|
||||
21d684ba7228f6dfd5a076b1113c3dfa72bde87a
|
||||
107b463b2adb5356e895b7a720851db33a86c6df
|
||||
@ -1 +1 @@
|
||||
e16d6224dcb22afb80cc5b911adafded076efefa
|
||||
9ccb57c3c41dcacffdfcf7b5f9fa0784369d5bcb
|
||||
@ -1 +1 @@
|
||||
b09b71b51ab2995a0dc16afe71fb5ce2e6da225a
|
||||
4de1547d6cd759c83e3b0583a488f1b15c399121
|
||||
@ -1 +1 @@
|
||||
fc02ef1f3b7e66a97711dcd5bb389e143dc19b9c
|
||||
a9815b632ea4feb0752c87b5a32788120c31bf0a
|
||||
@ -1 +1 @@
|
||||
a823c849a52a5306ffa46e3a2ddf398be980b648
|
||||
b99841c60ea289599e9489509cbd6f8cf9ac23bb
|
||||
@ -11,7 +11,7 @@
|
||||
#include "mini.h"
|
||||
|
||||
/* Version number of the AOT file format */
|
||||
#define MONO_AOT_FILE_VERSION 169
|
||||
#define MONO_AOT_FILE_VERSION 170
|
||||
|
||||
#define MONO_AOT_TRAMP_PAGE_SIZE 16384
|
||||
|
||||
@ -200,6 +200,8 @@ typedef struct MonoAotFileInfo
|
||||
guint32 double_align, long_align, generic_tramp_num, card_table_shift_bits, card_table_mask;
|
||||
/* The page size used by trampoline pages */
|
||||
guint32 tramp_page_size;
|
||||
/* Size of each entry stored at method_addresses */
|
||||
guint32 call_table_entry_size;
|
||||
/*
|
||||
* The number of GOT entries which need to be preinitialized when the
|
||||
* module is loaded.
|
||||
|
||||
@ -1 +1 @@
|
||||
ffed1916a720a1e89261ce82336b46f65f37ed41
|
||||
7050486fb0bc528260edf062d2a354c6d0534aa0
|
||||
@ -1 +1 @@
|
||||
#define FULL_VERSION "explicit/9a88a36"
|
||||
#define FULL_VERSION "explicit/11e1499"
|
||||
|
||||
@ -336,7 +336,6 @@ mono_merp_send (MERPStruct *merp)
|
||||
} else {
|
||||
int status;
|
||||
waitpid (pid, &status, 0);
|
||||
gboolean exit_success = FALSE;
|
||||
int exit_status = FALSE;
|
||||
|
||||
while (TRUE) {
|
||||
@ -345,7 +344,6 @@ mono_merp_send (MERPStruct *merp)
|
||||
|
||||
if (WIFEXITED(status)) {
|
||||
exit_status = WEXITSTATUS(status);
|
||||
exit_success = TRUE;
|
||||
invoke_success = (exit_status == 0);
|
||||
break;
|
||||
} else if (WIFSIGNALED(status)) {
|
||||
|
||||
@ -136,6 +136,15 @@ file_for_summary_stage (const char *directory, MonoSummaryStage stage, gchar *bu
|
||||
g_snprintf (buff, sizeof_buff, "%s%scrash_stage_%d", directory, G_DIR_SEPARATOR_S, stage);
|
||||
}
|
||||
|
||||
static void
|
||||
create_stage_mark_file (void)
|
||||
{
|
||||
char out_file [200];
|
||||
file_for_summary_stage (log.directory, log.level, out_file, sizeof(out_file));
|
||||
int handle = g_open (out_file, O_WRONLY | O_CREAT, S_IWUSR | S_IRUSR | S_IRGRP | S_IROTH);
|
||||
close(handle);
|
||||
}
|
||||
|
||||
gboolean
|
||||
mono_summarize_set_timeline_dir (const char *directory)
|
||||
{
|
||||
@ -156,30 +165,27 @@ mono_summarize_timeline_start (void)
|
||||
if (!configured_timeline_dir)
|
||||
return;
|
||||
|
||||
log.level = MonoSummarySetup;
|
||||
log.directory = configured_timeline_dir;
|
||||
mono_summarize_timeline_phase_log (MonoSummarySetup);
|
||||
}
|
||||
|
||||
void
|
||||
mono_summarize_double_fault_log (void)
|
||||
{
|
||||
char out_file [200];
|
||||
file_for_summary_stage (log.directory, MonoSummaryDoubleFault, out_file, sizeof(out_file));
|
||||
int handle = g_open (out_file, O_WRONLY | O_CREAT, S_IWUSR | S_IRUSR | S_IRGRP | S_IROTH);
|
||||
close(handle);
|
||||
mono_summarize_timeline_phase_log (MonoSummaryDoubleFault);
|
||||
}
|
||||
|
||||
void
|
||||
mono_summarize_timeline_phase_log (MonoSummaryStage next)
|
||||
{
|
||||
if (log.level == MonoSummaryNone)
|
||||
return;
|
||||
|
||||
if (!log.directory)
|
||||
return;
|
||||
|
||||
MonoSummaryStage out_level;
|
||||
switch (log.level) {
|
||||
case MonoSummaryNone:
|
||||
out_level = MonoSummarySetup;
|
||||
break;
|
||||
case MonoSummarySetup:
|
||||
out_level = MonoSummarySuspendHandshake;
|
||||
break;
|
||||
@ -223,23 +229,16 @@ mono_summarize_timeline_phase_log (MonoSummaryStage next)
|
||||
return;
|
||||
}
|
||||
|
||||
g_assertf(out_level == next, "Log Error: Log transition to %d, actual expected next step is %d\n", next, out_level);
|
||||
|
||||
char out_file [200];
|
||||
memset (out_file, 0, sizeof(out_file));
|
||||
file_for_summary_stage (log.directory, out_level, out_file, sizeof(out_file));
|
||||
|
||||
int handle = g_open (out_file, O_WRONLY | O_CREAT, S_IWUSR | S_IRUSR | S_IRGRP | S_IROTH);
|
||||
close(handle);
|
||||
g_assertf(out_level == next || next == MonoSummaryDoubleFault, "Log Error: Log transition to %d, actual expected next step is %d\n", next, out_level);
|
||||
|
||||
log.level = out_level;
|
||||
create_stage_mark_file ();
|
||||
// To check, comment out normally
|
||||
// DO NOT MERGE UNCOMMENTED
|
||||
// As this does a lot of FILE io
|
||||
//
|
||||
// g_assert (out_level == mono_summarize_timeline_read_level (log.directory, FALSE));
|
||||
|
||||
log.level = out_level;
|
||||
|
||||
if (out_level == MonoSummaryDone)
|
||||
memset (&log, 0, sizeof (log));
|
||||
|
||||
|
||||
@ -21,7 +21,7 @@
|
||||
#define MONO_NATIVE_STATE_PROTOCOL_VERSION "0.0.4"
|
||||
|
||||
typedef enum {
|
||||
MonoSummaryNone,
|
||||
MonoSummaryNone = 0,
|
||||
MonoSummarySetup,
|
||||
MonoSummarySuspendHandshake,
|
||||
MonoSummaryUnmanagedStacks,
|
||||
|
||||
@ -525,8 +525,8 @@ distclean-generic:
|
||||
maintainer-clean-generic:
|
||||
@echo "This command is intended for maintainers to use"
|
||||
@echo "it deletes files that may require special tools to rebuild."
|
||||
@ENABLE_MSVC_FALSE@install-exec-local:
|
||||
@ENABLE_MSVC_FALSE@clean-local:
|
||||
@ENABLE_MSVC_FALSE@install-exec-local:
|
||||
clean: clean-am
|
||||
|
||||
clean-am: clean-generic clean-libtool clean-local mostlyclean-am
|
||||
|
||||
BIN
po/mcs/de.gmo
BIN
po/mcs/de.gmo
Binary file not shown.
@ -1 +1 @@
|
||||
7abe3ecebe2f887d9af5a1f0976857d4fdef49c4
|
||||
735fdd69a36f0602ee03a8e4e28b65dbfb174488
|
||||
BIN
po/mcs/es.gmo
BIN
po/mcs/es.gmo
Binary file not shown.
@ -1 +1 @@
|
||||
110051a8c257e8de7d7fd58c4971f3499e334723
|
||||
fc1cc35d4017c43733665195c297bb68a9f81c36
|
||||
BIN
po/mcs/ja.gmo
BIN
po/mcs/ja.gmo
Binary file not shown.
@ -1 +1 @@
|
||||
cc8ba8338d00d7ef69dada9cc41424d8c8bedb6e
|
||||
a8e3dc735a98f21265d993a4fcc630c92cb38916
|
||||
@ -6,9 +6,9 @@
|
||||
#, fuzzy
|
||||
msgid ""
|
||||
msgstr ""
|
||||
"Project-Id-Version: mono 6.6.0.121\n"
|
||||
"Project-Id-Version: mono 6.6.0.123\n"
|
||||
"Report-Msgid-Bugs-To: http://www.mono-project.com/Bugs\n"
|
||||
"POT-Creation-Date: 2019-10-10 08:37+0000\n"
|
||||
"POT-Creation-Date: 2019-10-11 08:30+0000\n"
|
||||
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
|
||||
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
|
||||
"Language-Team: LANGUAGE <LL@li.org>\n"
|
||||
|
||||
BIN
po/mcs/pt_BR.gmo
BIN
po/mcs/pt_BR.gmo
Binary file not shown.
@ -1 +1 @@
|
||||
3a9766821c65f299c79069b3eb1a97e5da4bf161
|
||||
fbf44231cabe005a0292afafc6226fec65638ec7
|
||||
Loading…
x
Reference in New Issue
Block a user