Merge branch 'upstream'

Former-commit-id: 8013591286bf9dafd849d42ceb541ba20ed712c7
This commit is contained in:
Xamarin Public Jenkins (auto-signing) 2019-05-03 09:15:30 +00:00
commit 8bb93d05cf
47 changed files with 41 additions and 40 deletions

View File

@ -1 +1 @@
2e75a6126574ffb90f2a89ff8434ad0c6b856281
ea28d6aca9d465bc7effe75ae533d43e870ab79f

View File

@ -1 +1 @@
56f546f26f3214afc8d7af07874855411303d06e
d0620cf39e646d091f9b3368daecb235b86c8ccd

View File

@ -41,7 +41,7 @@ static partial class Consts
// Use these assembly version constants to make code more maintainable.
//
public const string MonoVersion = "6.0.0.207";
public const string MonoVersion = "6.0.0.209";
public const string MonoCompany = "Mono development team";
public const string MonoProduct = "Mono Common Language Infrastructure";
public const string MonoCopyright = "(c) Various Mono authors";

View File

@ -1 +1 @@
950b440861ed918cee6972cb02f0b0e6fca0436f
98b02d7d0729482000041615c9b862196841d967

View File

@ -1 +1 @@
07e999befe04c1a7241e2eef0ead2d79eac9f6f7
f8f6dd535cb3839dd9c04fee3b4ec55d26915314

View File

@ -1 +1 @@
c248646ab7b735c9a6a1c5553398aab0fdd38c02
ba7e59068c8ec816e5b0fee1eacb463e20762d33

View File

@ -1 +1 @@
e26fb15307669fd2099f7d3d8d51ece90e27e3c0
c025a10da21ea4cb58bf2f8bf07584ff420445e4

View File

@ -1 +1 @@
1fed7795d1dbeec82e760e90525daa3845dd967d
73a332928499b84fe731c680a19fed0ebbbeb98d

View File

@ -1 +1 @@
f11414105e638d6a072c87d8feebdb65060b59c8
d9087fc58f93a57a59ac9cabbe64673c30dd3dbd

View File

@ -1 +1 @@
95be4d8888b8041b726fdc3a85a0abdd1108de30
7ee1ae602eeea1ec6dc6c15a1447deab1e140ad2

View File

@ -1 +1 @@
950b440861ed918cee6972cb02f0b0e6fca0436f
98b02d7d0729482000041615c9b862196841d967

View File

@ -1 +1 @@
07e999befe04c1a7241e2eef0ead2d79eac9f6f7
f8f6dd535cb3839dd9c04fee3b4ec55d26915314

View File

@ -1 +1 @@
c248646ab7b735c9a6a1c5553398aab0fdd38c02
ba7e59068c8ec816e5b0fee1eacb463e20762d33

View File

@ -1 +1 @@
e26fb15307669fd2099f7d3d8d51ece90e27e3c0
c025a10da21ea4cb58bf2f8bf07584ff420445e4

View File

@ -1 +1 @@
1fed7795d1dbeec82e760e90525daa3845dd967d
73a332928499b84fe731c680a19fed0ebbbeb98d

View File

@ -1 +1 @@
f11414105e638d6a072c87d8feebdb65060b59c8
d9087fc58f93a57a59ac9cabbe64673c30dd3dbd

View File

@ -1 +1 @@
95be4d8888b8041b726fdc3a85a0abdd1108de30
7ee1ae602eeea1ec6dc6c15a1447deab1e140ad2

View File

@ -1 +1 @@
950b440861ed918cee6972cb02f0b0e6fca0436f
98b02d7d0729482000041615c9b862196841d967

View File

@ -1 +1 @@
07e999befe04c1a7241e2eef0ead2d79eac9f6f7
f8f6dd535cb3839dd9c04fee3b4ec55d26915314

View File

@ -1 +1 @@
c248646ab7b735c9a6a1c5553398aab0fdd38c02
ba7e59068c8ec816e5b0fee1eacb463e20762d33

View File

@ -1 +1 @@
e26fb15307669fd2099f7d3d8d51ece90e27e3c0
c025a10da21ea4cb58bf2f8bf07584ff420445e4

View File

@ -1 +1 @@
1fed7795d1dbeec82e760e90525daa3845dd967d
73a332928499b84fe731c680a19fed0ebbbeb98d

View File

@ -1 +1 @@
f11414105e638d6a072c87d8feebdb65060b59c8
d9087fc58f93a57a59ac9cabbe64673c30dd3dbd

View File

@ -1 +1 @@
95be4d8888b8041b726fdc3a85a0abdd1108de30
7ee1ae602eeea1ec6dc6c15a1447deab1e140ad2

View File

@ -1 +1 @@
950b440861ed918cee6972cb02f0b0e6fca0436f
98b02d7d0729482000041615c9b862196841d967

View File

@ -1 +1 @@
07e999befe04c1a7241e2eef0ead2d79eac9f6f7
f8f6dd535cb3839dd9c04fee3b4ec55d26915314

View File

@ -1 +1 @@
4ecbea5c1b0dfde4812c8eba5a1a380f6adac143
15db5c7952ea421bcb9b86ca44160f8ef865f76a

View File

@ -1 +1 @@
e26fb15307669fd2099f7d3d8d51ece90e27e3c0
c025a10da21ea4cb58bf2f8bf07584ff420445e4

View File

@ -1 +1 @@
1fed7795d1dbeec82e760e90525daa3845dd967d
73a332928499b84fe731c680a19fed0ebbbeb98d

View File

@ -1 +1 @@
f11414105e638d6a072c87d8feebdb65060b59c8
d9087fc58f93a57a59ac9cabbe64673c30dd3dbd

View File

@ -1 +1 @@
ab93531e2185fed98bcb02e97150c5ad0c2f9e51
64fabf277abb34e89da36d718d3f131a4781361f

View File

@ -1 +1 @@
1b1a45b7976986c7910e593aea762e789e3bcf28
6e72081959838641e152c84488d4a78862458fd8

View File

@ -252,7 +252,8 @@ get_throw_trampoline (int size, gboolean corlib, gboolean rethrow, gboolean llvm
int param_size = 8;
if (!resume_unwind && !corlib)
param_size += 4; // Extra arg
param_size = ALIGN_TO (param_size, MONO_ARCH_FRAME_ALIGNMENT);
/* SP isn't 16byte aligned at this point which matters for some targets */
param_size = ALIGN_TO (cfa_offset + param_size, MONO_ARCH_FRAME_ALIGNMENT) - cfa_offset;
ARM_SUB_REG_IMM8 (code, ARMREG_SP, ARMREG_SP, param_size);
cfa_offset += param_size;
mono_add_unwind_op_def_cfa_offset (unwind_ops, code, start, cfa_offset);

View File

@ -1 +1 @@
#define FULL_VERSION "explicit/d04d534"
#define FULL_VERSION "explicit/9412149"

Binary file not shown.

View File

@ -1 +1 @@
2f42cf79ad78d0b139800a7bcaf62e1beb662cba
a896630fec06909b1d4284a016e7b6ed6aac6bcd

Binary file not shown.

View File

@ -1 +1 @@
e892bf1c4e2ec9d3e2cd668be33345fae47a6a9f
4ba497807bb444c16e6521038d24b539cba0dc91

Binary file not shown.

View File

@ -1 +1 @@
cadcd7d95d1f4822c27bbc821ee39a67598563e1
6f04a53511b2171d90da235a8a9c1af4f5ed615f

View File

@ -6,9 +6,9 @@
#, fuzzy
msgid ""
msgstr ""
"Project-Id-Version: mono 6.0.0.207\n"
"Project-Id-Version: mono 6.0.0.209\n"
"Report-Msgid-Bugs-To: http://www.mono-project.com/Bugs\n"
"POT-Creation-Date: 2019-05-01 08:07+0000\n"
"POT-Creation-Date: 2019-05-03 08:18+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"

Binary file not shown.

View File

@ -1 +1 @@
9aa8c6f5070de6b813b576fb7b7bb3d84fbc3ff1
b36d19e4259b073bbfdaf5ac630f8f3da7984a4e