From e6a13d29730fb90270cd81197ccc5278fd903d7f Mon Sep 17 00:00:00 2001 From: "Xamarin Public Jenkins (auto-signing)" Date: Mon, 5 Dec 2016 19:44:12 +0000 Subject: [PATCH] Imported Upstream version 4.8.0.374 Former-commit-id: 8964766181f84d5f0cd5e877b6d9fadc547236cc --- .../lib/monolite/basic.exe.REMOVED.git-id | 2 +- mcs/mcs/settings.cs | 2 +- mono/metadata/loader.h | 4 ---- mono/metadata/metadata-internals.h | 3 +++ mono/mini/Makefile.am | 2 +- mono/mini/Makefile.am.in | 2 +- mono/mini/Makefile.in.REMOVED.git-id | 2 +- mono/mini/version.h | 2 +- po/mcs/de.gmo | Bin 5406 -> 5406 bytes po/mcs/de.po.REMOVED.git-id | 2 +- po/mcs/es.gmo | Bin 16329 -> 16329 bytes po/mcs/es.po.REMOVED.git-id | 2 +- po/mcs/ja.gmo | Bin 20863 -> 20863 bytes po/mcs/ja.po.REMOVED.git-id | 2 +- po/mcs/mcs.pot | 2 +- po/mcs/pt_BR.gmo | Bin 73161 -> 73161 bytes po/mcs/pt_BR.po.REMOVED.git-id | 2 +- 17 files changed, 14 insertions(+), 15 deletions(-) diff --git a/mcs/class/lib/monolite/basic.exe.REMOVED.git-id b/mcs/class/lib/monolite/basic.exe.REMOVED.git-id index 877945dab4..d8a3d132e7 100644 --- a/mcs/class/lib/monolite/basic.exe.REMOVED.git-id +++ b/mcs/class/lib/monolite/basic.exe.REMOVED.git-id @@ -1 +1 @@ -9cb84f032c0698d23a029b0f4719f509ddf8080f \ No newline at end of file +b3f8f8c80a38ce31cc9e392a4bb960e58d84a21a \ No newline at end of file diff --git a/mcs/mcs/settings.cs b/mcs/mcs/settings.cs index cb9365d14d..c972522612 100644 --- a/mcs/mcs/settings.cs +++ b/mcs/mcs/settings.cs @@ -1195,7 +1195,7 @@ namespace Mono.CSharp { } return ParseResult.Success; - case "runtimemetadataversion": + case "/runtimemetadataversion": if (value.Length == 0) { Error_RequiresArgument (option); return ParseResult.Error; diff --git a/mono/metadata/loader.h b/mono/metadata/loader.h index 6382c774ae..328cb5ac75 100644 --- a/mono/metadata/loader.h +++ b/mono/metadata/loader.h @@ -4,7 +4,6 @@ #include #include #include -#include MONO_BEGIN_DECLS @@ -64,9 +63,6 @@ mono_lookup_internal_call (MonoMethod *method); void* mono_lookup_internal_call_full (MonoMethod *method, mono_bool *uses_handles); -void -mono_loader_register_module (const char *name, MonoDl *module); - MONO_API const char* mono_lookup_icall_symbol (MonoMethod *m); diff --git a/mono/metadata/metadata-internals.h b/mono/metadata/metadata-internals.h index a1b9eb8417..8ae692d470 100644 --- a/mono/metadata/metadata-internals.h +++ b/mono/metadata/metadata-internals.h @@ -910,5 +910,8 @@ mono_image_set_description (MonoImageSet *); MonoImageSet * mono_find_image_set_owner (void *ptr); +void +mono_loader_register_module (const char *name, MonoDl *module); + #endif /* __MONO_METADATA_INTERNALS_H__ */ diff --git a/mono/mini/Makefile.am b/mono/mini/Makefile.am index 6f03a05625..81e79f2837 100644 --- a/mono/mini/Makefile.am +++ b/mono/mini/Makefile.am @@ -860,7 +860,7 @@ EXTRA_DIST = TestDriver.cs \ Makefile.am.in version.h: Makefile - echo "#define FULL_VERSION \"Stable 4.8.0.371/902b4a9\"" > version.h + echo "#define FULL_VERSION \"Stable 4.8.0.374/5e1b0a0\"" > version.h # Utility target for patching libtool to speed up linking patch-libtool: diff --git a/mono/mini/Makefile.am.in b/mono/mini/Makefile.am.in index 6f03a05625..81e79f2837 100755 --- a/mono/mini/Makefile.am.in +++ b/mono/mini/Makefile.am.in @@ -860,7 +860,7 @@ EXTRA_DIST = TestDriver.cs \ Makefile.am.in version.h: Makefile - echo "#define FULL_VERSION \"Stable 4.8.0.371/902b4a9\"" > version.h + echo "#define FULL_VERSION \"Stable 4.8.0.374/5e1b0a0\"" > version.h # Utility target for patching libtool to speed up linking patch-libtool: diff --git a/mono/mini/Makefile.in.REMOVED.git-id b/mono/mini/Makefile.in.REMOVED.git-id index b8246e856c..50179631a7 100644 --- a/mono/mini/Makefile.in.REMOVED.git-id +++ b/mono/mini/Makefile.in.REMOVED.git-id @@ -1 +1 @@ -eaecaed9eab43c2e6afd56e9f55f1f0926fb397a \ No newline at end of file +bd2dc970d2cd2bab2dd66387eacff13809c8b08a \ No newline at end of file diff --git a/mono/mini/version.h b/mono/mini/version.h index 199debe65b..c87ef383c4 100644 --- a/mono/mini/version.h +++ b/mono/mini/version.h @@ -1 +1 @@ -#define FULL_VERSION "Stable 4.8.0.371/902b4a9" +#define FULL_VERSION "Stable 4.8.0.374/5e1b0a0" diff --git a/po/mcs/de.gmo b/po/mcs/de.gmo index dcafa0cc6a88b2e1fa39a4b5edebe1357bb2b7b8..773dc839b75908415a686bfed97c200fe248ce2d 100644 GIT binary patch delta 23 ecmbQIHBW29BQ7o@T?11ELrW_olg)3qjJNPErV56ZRz@b9`PB=w0Cj5zoB#j- delta 25 gcmeyri1Gg-#tp3MT!y+v77B)zRwf3U`PB=w0CkWDo&W#< diff --git a/po/mcs/ja.po.REMOVED.git-id b/po/mcs/ja.po.REMOVED.git-id index a47e8b362e..e33137a2a4 100644 --- a/po/mcs/ja.po.REMOVED.git-id +++ b/po/mcs/ja.po.REMOVED.git-id @@ -1 +1 @@ -2ba3b14f1ede70361c9f8a5155745e3f7574c78a \ No newline at end of file +3eba478262d3247ca64c6221277a01ea605062c7 \ No newline at end of file diff --git a/po/mcs/mcs.pot b/po/mcs/mcs.pot index d2516d614f..c31f7c74a8 100644 --- a/po/mcs/mcs.pot +++ b/po/mcs/mcs.pot @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: mono 4.8.0\n" "Report-Msgid-Bugs-To: http://www.mono-project.com/Bugs\n" -"POT-Creation-Date: 2016-11-28 19:40+0000\n" +"POT-Creation-Date: 2016-12-05 19:24+0000\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" diff --git a/po/mcs/pt_BR.gmo b/po/mcs/pt_BR.gmo index 75b31411c513fcf7ba415c9b439a67a7607ac938..75d0e0299d99ed6ab49e7ae46e6542bf4337600e 100644 GIT binary patch delta 25 hcmX@Po8{zgmJQ<5xQuiSOce|*t&B`ID^6R{4gh;>2>$>8 delta 25 hcmX@Po8{zgmJQ<5xD0iTEEEhatxOCyD^6R{4gh}2A diff --git a/po/mcs/pt_BR.po.REMOVED.git-id b/po/mcs/pt_BR.po.REMOVED.git-id index dedec74de0..cd8d11ed18 100644 --- a/po/mcs/pt_BR.po.REMOVED.git-id +++ b/po/mcs/pt_BR.po.REMOVED.git-id @@ -1 +1 @@ -a64e6f8b63e4cb5d27429c1732c5430a328b73d3 \ No newline at end of file +565333991ccab0166ccd8d9fc1b80f2f08d79e84 \ No newline at end of file