Imported Upstream version 6.0.0.205

Former-commit-id: 84f1104b57cacbdd1cc99d0d74d9a8251f311cc7
This commit is contained in:
Xamarin Public Jenkins (auto-signing) 2019-04-30 08:40:55 +00:00
parent fab74e4a36
commit e0066d9519
50 changed files with 50 additions and 44 deletions

View File

@ -1 +1 @@
64732f5c747295ac40f6a4eec0eb6263ce3d894e 874a4ec01311dc6c5075924f52a27c2988e99a1b

View File

@ -1 +1 @@
332ac998e4f264d3b95ba6872b666922c5845a46 f516f0141e10f66dfb40a6be7786f4c4b2a983c1

View File

@ -921,6 +921,7 @@ mono_bitset_copyto (const MonoBitSet *src, MonoBitSet *dest)
<div class="mapi-declaration mapi-section">Syntax</div> <div class="mapi-declaration mapi-section">Syntax</div>
<div class="mapi-prototype">guint32 <div class="mapi-prototype">guint32
mono_bitset_count (const MonoBitSet *set) mono_bitset_count (const MonoBitSet *set)
</div> </div>
<p /> <p />
<div class="mapi-section">Parameters</div> <div class="mapi-section">Parameters</div>

View File

@ -41,7 +41,7 @@ static partial 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 = "6.0.0.200"; public const string MonoVersion = "6.0.0.205";
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";

View File

@ -1 +1 @@
068708bca6cbf02077401210c057691aa68a1a7a fbac8fa50986dbf39863ea8b3628ed0df15e135a

View File

@ -1 +1 @@
77e40eb21368d5c3a81795a6a47df60ee214e3c5 4d282c7948e59697eabb11fb03b14ad2c8a19245

View File

@ -1 +1 @@
112dfc274abf85bebb50691eb67567dcab985ce0 f709e4dc2dea5b2431b22443500ec10aa9b4c327

View File

@ -1 +1 @@
9ac13f7168dd7dfa5c5b1dec4fbe6d81b0f756da f0e695ae775fc1d2adb9cfe35eb56adb28b30679

View File

@ -1 +1 @@
fd6b38d587e21d03eeccc174070a4a1e0c6ea15a 9b54a742b5a4000205afa63a496880bf2e9ca84b

View File

@ -1 +1 @@
5b7a60dd0969c74e4a46a601828fc5132a5d2b3a c977817a68104493619e62eb6335c80dee8ce69a

View File

@ -1 +1 @@
f85696e7e1fa11b266a433d1be0f91a7b17f1e02 d9f38965a8e823355e344b9717bf703041372f3d

View File

@ -1 +1 @@
068708bca6cbf02077401210c057691aa68a1a7a fbac8fa50986dbf39863ea8b3628ed0df15e135a

View File

@ -1 +1 @@
77e40eb21368d5c3a81795a6a47df60ee214e3c5 4d282c7948e59697eabb11fb03b14ad2c8a19245

View File

@ -1 +1 @@
112dfc274abf85bebb50691eb67567dcab985ce0 f709e4dc2dea5b2431b22443500ec10aa9b4c327

View File

@ -1 +1 @@
9ac13f7168dd7dfa5c5b1dec4fbe6d81b0f756da f0e695ae775fc1d2adb9cfe35eb56adb28b30679

View File

@ -1 +1 @@
fd6b38d587e21d03eeccc174070a4a1e0c6ea15a 9b54a742b5a4000205afa63a496880bf2e9ca84b

View File

@ -1 +1 @@
5b7a60dd0969c74e4a46a601828fc5132a5d2b3a c977817a68104493619e62eb6335c80dee8ce69a

View File

@ -1 +1 @@
f85696e7e1fa11b266a433d1be0f91a7b17f1e02 d9f38965a8e823355e344b9717bf703041372f3d

View File

@ -1 +1 @@
068708bca6cbf02077401210c057691aa68a1a7a fbac8fa50986dbf39863ea8b3628ed0df15e135a

View File

@ -1 +1 @@
77e40eb21368d5c3a81795a6a47df60ee214e3c5 4d282c7948e59697eabb11fb03b14ad2c8a19245

View File

@ -1 +1 @@
112dfc274abf85bebb50691eb67567dcab985ce0 f709e4dc2dea5b2431b22443500ec10aa9b4c327

View File

@ -1 +1 @@
9ac13f7168dd7dfa5c5b1dec4fbe6d81b0f756da f0e695ae775fc1d2adb9cfe35eb56adb28b30679

View File

@ -1 +1 @@
fd6b38d587e21d03eeccc174070a4a1e0c6ea15a 9b54a742b5a4000205afa63a496880bf2e9ca84b

View File

@ -1 +1 @@
5b7a60dd0969c74e4a46a601828fc5132a5d2b3a c977817a68104493619e62eb6335c80dee8ce69a

View File

@ -1 +1 @@
f85696e7e1fa11b266a433d1be0f91a7b17f1e02 d9f38965a8e823355e344b9717bf703041372f3d

View File

@ -1 +1 @@
068708bca6cbf02077401210c057691aa68a1a7a fbac8fa50986dbf39863ea8b3628ed0df15e135a

View File

@ -1 +1 @@
77e40eb21368d5c3a81795a6a47df60ee214e3c5 4d282c7948e59697eabb11fb03b14ad2c8a19245

View File

@ -1 +1 @@
63f54def4d6ec3bd7786ac41211b7105d787ca2f f25a0c95f6bd5ce8b3bc6e92c15a3e3babfa2217

View File

@ -1 +1 @@
9ac13f7168dd7dfa5c5b1dec4fbe6d81b0f756da f0e695ae775fc1d2adb9cfe35eb56adb28b30679

View File

@ -1 +1 @@
fd6b38d587e21d03eeccc174070a4a1e0c6ea15a 9b54a742b5a4000205afa63a496880bf2e9ca84b

View File

@ -1 +1 @@
5b7a60dd0969c74e4a46a601828fc5132a5d2b3a c977817a68104493619e62eb6335c80dee8ce69a

View File

@ -1 +1 @@
5569882732a0eaf41525bc7ed208a473dea1f6a9 edc65dad432879f2515c96ce0910bcf8876cab8d

View File

@ -1 +1 @@
#define FULL_VERSION "explicit/c4ea64e" #define FULL_VERSION "explicit/00362f5"

View File

@ -1544,7 +1544,9 @@ bitcount (mword d)
{ {
int count = 0; int count = 0;
#ifdef __GNUC__ #if defined (__GNUC__) && !defined (HOST_WIN32)
// The builtins do work on Win32, but can cause a not worthwhile runtime dependency.
// See https://github.com/mono/mono/pull/14248.
if (sizeof (mword) == 8) if (sizeof (mword) == 8)
count += __builtin_popcountll (d); count += __builtin_popcountll (d);
else else

View File

@ -1442,10 +1442,10 @@ distclean-generic:
maintainer-clean-generic: maintainer-clean-generic:
@echo "This command is intended for maintainers to use" @echo "This command is intended for maintainers to use"
@echo "it deletes files that may require special tools to rebuild." @echo "it deletes files that may require special tools to rebuild."
@CROSS_COMPILE_TRUE@test-local:
@HOST_WIN32_TRUE@test-local:
@CROSS_COMPILE_TRUE@clean-local: @CROSS_COMPILE_TRUE@clean-local:
@HOST_WIN32_TRUE@clean-local: @HOST_WIN32_TRUE@clean-local:
@CROSS_COMPILE_TRUE@test-local:
@HOST_WIN32_TRUE@test-local:
clean: clean-am clean: clean-am
clean-am: clean-checkPROGRAMS clean-generic clean-libtool clean-local \ clean-am: clean-checkPROGRAMS clean-generic clean-libtool clean-local \

View File

@ -201,14 +201,17 @@ mono_bitset_size (const MonoBitSet *set) {
* \returns number of bits that are set. * \returns number of bits that are set.
*/ */
guint32 guint32
mono_bitset_count (const MonoBitSet *set) { mono_bitset_count (const MonoBitSet *set)
{
guint32 i, count; guint32 i, count;
gsize d; gsize d;
count = 0; count = 0;
for (i = 0; i < set->size / BITS_PER_CHUNK; ++i) { for (i = 0; i < set->size / BITS_PER_CHUNK; ++i) {
d = set->data [i]; d = set->data [i];
#ifdef __GNUC__ #if defined (__GNUC__) && !defined (HOST_WIN32)
// The builtins do work on Win32, but can cause a not worthwhile runtime dependency.
// See https://github.com/mono/mono/pull/14248.
if (sizeof (gsize) == sizeof (unsigned int)) if (sizeof (gsize) == sizeof (unsigned int))
count += __builtin_popcount (d); count += __builtin_popcount (d);
else else

View File

@ -515,8 +515,8 @@ distclean-generic:
maintainer-clean-generic: maintainer-clean-generic:
@echo "This command is intended for maintainers to use" @echo "This command is intended for maintainers to use"
@echo "it deletes files that may require special tools to rebuild." @echo "it deletes files that may require special tools to rebuild."
@ENABLE_MSVC_FALSE@clean-local:
@ENABLE_MSVC_FALSE@install-exec-local: @ENABLE_MSVC_FALSE@install-exec-local:
@ENABLE_MSVC_FALSE@clean-local:
clean: clean-am clean: clean-am
clean-am: clean-generic clean-libtool clean-local mostlyclean-am clean-am: clean-generic clean-libtool clean-local mostlyclean-am

Binary file not shown.

View File

@ -1 +1 @@
bfa5c933bc9efaefbe72a13df7f90dfc1593bf7c 5752897f532a1482efd12a0475e45c3e2089632a

Binary file not shown.

View File

@ -1 +1 @@
cd3257ba6536d30e9352a2b7809cce57045e65b0 5564073c3ef87fb7584b06785b9cf8400f399a6f

Binary file not shown.

View File

@ -1 +1 @@
9643eaed33a60a7a26462206811d7f5ce230b26e e8827dcb68689563e396a2f329d2c7b63fef6342

View File

@ -6,9 +6,9 @@
#, fuzzy #, fuzzy
msgid "" msgid ""
msgstr "" msgstr ""
"Project-Id-Version: mono 6.0.0.200\n" "Project-Id-Version: mono 6.0.0.205\n"
"Report-Msgid-Bugs-To: http://www.mono-project.com/Bugs\n" "Report-Msgid-Bugs-To: http://www.mono-project.com/Bugs\n"
"POT-Creation-Date: 2019-04-27 08:06+0000\n" "POT-Creation-Date: 2019-04-30 08:12+0000\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n" "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
"Language-Team: LANGUAGE <LL@li.org>\n" "Language-Team: LANGUAGE <LL@li.org>\n"

Binary file not shown.

View File

@ -1 +1 @@
4916c8b2c9bf58e19c66c0ff74e9174fcbf6cff1 3904eab63cefdcac10f7cc7ab5987be2441293d3