From 1190d13a04022f4ea6571cb17998ca9df144cd17 Mon Sep 17 00:00:00 2001 From: "Xamarin Public Jenkins (auto-signing)" Date: Tue, 28 Mar 2017 13:01:56 +0000 Subject: [PATCH] Imported Upstream version 4.8.0.524 Former-commit-id: b268dfc510617f0bc2b6032dc25acd75a8707419 --- mono/mini/Makefile.am | 2 +- mono/mini/Makefile.am.in | 2 +- mono/mini/Makefile.in.REMOVED.git-id | 2 +- mono/mini/aot-runtime.c.REMOVED.git-id | 2 +- .../mini-generic-sharing.c.REMOVED.git-id | 2 +- mono/mini/tramp-amd64-gsharedvt.c | 5 +++-- 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 +- 16 files changed, 14 insertions(+), 13 deletions(-) diff --git a/mono/mini/Makefile.am b/mono/mini/Makefile.am index b0f0a524cd..96324a3f5b 100644 --- a/mono/mini/Makefile.am +++ b/mono/mini/Makefile.am @@ -861,7 +861,7 @@ EXTRA_DIST = TestDriver.cs \ Makefile.am.in version.h: Makefile - echo "#define FULL_VERSION \"Stable 4.8.0.520/8f6d0f6\"" > version.h + echo "#define FULL_VERSION \"Stable 4.8.0.524/9d74414\"" > 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 b0f0a524cd..96324a3f5b 100755 --- a/mono/mini/Makefile.am.in +++ b/mono/mini/Makefile.am.in @@ -861,7 +861,7 @@ EXTRA_DIST = TestDriver.cs \ Makefile.am.in version.h: Makefile - echo "#define FULL_VERSION \"Stable 4.8.0.520/8f6d0f6\"" > version.h + echo "#define FULL_VERSION \"Stable 4.8.0.524/9d74414\"" > 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 713bc98983..5c8f3ee388 100644 --- a/mono/mini/Makefile.in.REMOVED.git-id +++ b/mono/mini/Makefile.in.REMOVED.git-id @@ -1 +1 @@ -0dc0111f92ce7928cc8fae909326c9c778d14418 \ No newline at end of file +4986144017a8c0420ec80252a3a599e26c17e6e0 \ No newline at end of file diff --git a/mono/mini/aot-runtime.c.REMOVED.git-id b/mono/mini/aot-runtime.c.REMOVED.git-id index 0662bc147c..0f27953527 100644 --- a/mono/mini/aot-runtime.c.REMOVED.git-id +++ b/mono/mini/aot-runtime.c.REMOVED.git-id @@ -1 +1 @@ -c9cf297db00016d19274c670f130a224b78f28e0 \ No newline at end of file +c87a4c6ff18b36bb7a84194a72158d2488e1d6d2 \ No newline at end of file diff --git a/mono/mini/mini-generic-sharing.c.REMOVED.git-id b/mono/mini/mini-generic-sharing.c.REMOVED.git-id index a0ce45f079..39e33209f7 100644 --- a/mono/mini/mini-generic-sharing.c.REMOVED.git-id +++ b/mono/mini/mini-generic-sharing.c.REMOVED.git-id @@ -1 +1 @@ -9fb754ed8666b96cdfb14ab226044f88c07885f4 \ No newline at end of file +b30d8573a1bd39f425b7569274a89f6e8238fb07 \ No newline at end of file diff --git a/mono/mini/tramp-amd64-gsharedvt.c b/mono/mini/tramp-amd64-gsharedvt.c index f5600adbde..0c986f14e7 100644 --- a/mono/mini/tramp-amd64-gsharedvt.c +++ b/mono/mini/tramp-amd64-gsharedvt.c @@ -142,7 +142,8 @@ mono_arch_get_gsharedvt_arg_trampoline (MonoDomain *domain, gpointer arg, gpoint mono_arch_flush_icache (start, code - start); mono_profiler_code_buffer_new (start, code - start, MONO_PROFILER_CODE_BUFFER_GENERICS_TRAMPOLINE, NULL); - g_assert (0); + mono_tramp_info_register (mono_tramp_info_create (NULL, start, code - start, NULL, NULL), domain); + return start; } @@ -281,7 +282,7 @@ mono_arch_get_gsharedvt_trampoline (MonoTrampInfo **info, gboolean aot) amd64_call_reg (code, AMD64_R11); #endif } else { - g_error ("no aot"); + amd64_call_code (code, mono_amd64_start_gsharedvt_call); } /* Method to call is now on RAX. Restore regs and jump */ diff --git a/mono/mini/version.h b/mono/mini/version.h index 5b9f7df8f0..64b2b25059 100644 --- a/mono/mini/version.h +++ b/mono/mini/version.h @@ -1 +1 @@ -#define FULL_VERSION "Stable 4.8.0.520/8f6d0f6" +#define FULL_VERSION "Stable 4.8.0.524/9d74414" diff --git a/po/mcs/de.gmo b/po/mcs/de.gmo index c36482755c411f2fa1f68a2fd149aa4969bd16c8..b278bb4c7f21a58edc3848fa2b1487cb193e23de 100644 GIT binary patch delta 21 ccmbQIHBW296D|%T3k5?XD^t_WZ@7%O08nWLtpET3 delta 21 ccmbQIHBW296D|%zQw2iYQ^hHA09TL(+5i9m diff --git a/po/mcs/es.po.REMOVED.git-id b/po/mcs/es.po.REMOVED.git-id index fe4ea733e3..a9254456f2 100644 --- a/po/mcs/es.po.REMOVED.git-id +++ b/po/mcs/es.po.REMOVED.git-id @@ -1 +1 @@ -5b0191f6046441a044d9c113716369b913a1ca05 \ No newline at end of file +0733bc2a663a77fd1dd5fd5f46cdb534c1d3c1ae \ No newline at end of file diff --git a/po/mcs/ja.gmo b/po/mcs/ja.gmo index cc7fb543c56499ddeb99924c347026eb1deb40f1..d352e4f1b3698906086e18cb35412847bf5ce978 100644 GIT binary patch delta 23 ecmeyri1Gg-#trQ197YxjhDKJVrknZI3$y@d&j&vM delta 23 ecmeyri1Gg-#trQ19EPR}h6YxKW}Erd3$y@db_X^9 diff --git a/po/mcs/ja.po.REMOVED.git-id b/po/mcs/ja.po.REMOVED.git-id index 1dd3b4de0b..e3afc99bb4 100644 --- a/po/mcs/ja.po.REMOVED.git-id +++ b/po/mcs/ja.po.REMOVED.git-id @@ -1 +1 @@ -fe426ecab7608b26c99f42691e81fc635addb99f \ No newline at end of file +caecb5d4fdd0d0bc83e5debb00957ae353ed5e37 \ No newline at end of file diff --git a/po/mcs/mcs.pot b/po/mcs/mcs.pot index 55fb3d3329..6a7297050d 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: 2017-03-15 10:16+0000\n" +"POT-Creation-Date: 2017-03-28 12:55+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 cf493bc784087f78985e694057fb159e0217e6ac..da21e500b12ca3ef2c1d7d1c7efec70941ca88d6 100644 GIT binary patch delta 23 fcmX@Po8{zgmJO2AIE*Y542`TzO*bn}ThR^xZ8iv^ delta 23 fcmX@Po8{zgmJO2AI1Eh{3=OOd%{D7eThR^xY~2W% diff --git a/po/mcs/pt_BR.po.REMOVED.git-id b/po/mcs/pt_BR.po.REMOVED.git-id index ab9f86e681..6567dda75d 100644 --- a/po/mcs/pt_BR.po.REMOVED.git-id +++ b/po/mcs/pt_BR.po.REMOVED.git-id @@ -1 +1 @@ -9f431fd588278451bee3612d0d6090248da2a85f \ No newline at end of file +b8e75c44b55aab69586daad5047407507bd82917 \ No newline at end of file