mono/linux-packaging-mono
0
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Imported Upstream version 4.8.0.524

Browse Source 
Former-commit-id: b268dfc510617f0bc2b6032dc25acd75a8707419
This commit is contained in:
Xamarin Public Jenkins (auto-signing)
2017-03-28 13:01:56 +00:00
parent dc50008e16
commit 1190d13a04
16 changed files with 14 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
mono/mini/Makefile.am
View File

@@ -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:

2
mono/mini/Makefile.am.in
View File

@@ -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:

2
mono/mini/Makefile.in.REMOVED.git-id
View File

@@ -1 +1 @@
0dc0111f92ce7928cc8fae909326c9c778d14418
4986144017a8c0420ec80252a3a599e26c17e6e0

2
mono/mini/aot-runtime.c.REMOVED.git-id
View File

@@ -1 +1 @@
c9cf297db00016d19274c670f130a224b78f28e0
c87a4c6ff18b36bb7a84194a72158d2488e1d6d2

2
mono/mini/mini-generic-sharing.c.REMOVED.git-id
View File

@@ -1 +1 @@
9fb754ed8666b96cdfb14ab226044f88c07885f4
b30d8573a1bd39f425b7569274a89f6e8238fb07

5
mono/mini/tramp-amd64-gsharedvt.c
View File

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

2
mono/mini/version.h
View File

@@ -1 +1 @@
#define FULL_VERSION "Stable 4.8.0.520/8f6d0f6"
#define FULL_VERSION "Stable 4.8.0.524/9d74414"