Merge branch 'upstream'

Former-commit-id: ac025c8e5d76d4ab640053fa1922142d6eb54d4f
2016-12-05 19:49:29 +00:00 · 2016-12-05 19:49:29 +00:00 · 34c34d0ca2
commit 34c34d0ca2
parent f7a75d3a02 e6a13d2973
17 changed files with 14 additions and 15 deletions
--- a/mcs/class/lib/monolite/basic.exe.REMOVED.git-id
+++ b/mcs/class/lib/monolite/basic.exe.REMOVED.git-id
@ -1 +1 @@
-9cb84f032c0698d23a029b0f4719f509ddf8080f
+b3f8f8c80a38ce31cc9e392a4bb960e58d84a21a
--- 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;
--- a/mono/metadata/loader.h
+++ b/mono/metadata/loader.h
@ -4,7 +4,6 @@
 #include <mono/metadata/metadata.h>
 #include <mono/metadata/image.h>
 #include <mono/utils/mono-error.h>
-#include <mono/utils/mono-dl.h>

 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);

--- 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__ */

--- 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:
--- 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:
--- a/mono/mini/Makefile.in.REMOVED.git-id
+++ b/mono/mini/Makefile.in.REMOVED.git-id
@ -1 +1 @@
-eaecaed9eab43c2e6afd56e9f55f1f0926fb397a
+bd2dc970d2cd2bab2dd66387eacff13809c8b08a
--- 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"
--- a/po/mcs/de.gmo
+++ b/po/mcs/de.gmo
--- a/po/mcs/de.po.REMOVED.git-id
+++ b/po/mcs/de.po.REMOVED.git-id
@ -1 +1 @@
-efa66576beb2b9d15f28279dcd30bd1fa26e3538
+0cbead8f0573d2cead8a1bc577181d4ae9095e50
--- a/po/mcs/es.gmo
+++ b/po/mcs/es.gmo
--- a/po/mcs/es.po.REMOVED.git-id
+++ b/po/mcs/es.po.REMOVED.git-id
@ -1 +1 @@
-93c80f11598a27a6b6aea96fc2405b456bf2ccb1
+d9e362d4bf3058a3c0ebf4b47a1838d3f82fe0da
--- a/po/mcs/ja.gmo
+++ b/po/mcs/ja.gmo
--- a/po/mcs/ja.po.REMOVED.git-id
+++ b/po/mcs/ja.po.REMOVED.git-id
@ -1 +1 @@
-2ba3b14f1ede70361c9f8a5155745e3f7574c78a
+3eba478262d3247ca64c6221277a01ea605062c7
--- 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 <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
--- a/po/mcs/pt_BR.gmo
+++ b/po/mcs/pt_BR.gmo
--- a/po/mcs/pt_BR.po.REMOVED.git-id
+++ b/po/mcs/pt_BR.po.REMOVED.git-id
@ -1 +1 @@
-a64e6f8b63e4cb5d27429c1732c5430a328b73d3
+565333991ccab0166ccd8d9fc1b80f2f08d79e84