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

Imported Upstream version 4.6.2.6

Browse Source 
Former-commit-id: acf0aed9cbf359eec20dc40fbeb30554b4ed84a3
This commit is contained in:
Xamarin Public Jenkins (auto-signing)
2016-11-02 14:46:16 +00:00
parent 36b9cc09f0
commit ee1447783b
35 changed files with 151 additions and 44 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
mono/metadata/domain-internals.h
View File

@@ -380,9 +380,6 @@ struct _MonoDomain {
GHashTable *method_rgctx_hash;
GHashTable *generic_virtual_cases;
MonoThunkFreeList **thunk_free_lists;
GHashTable *generic_virtual_thunks;
/* Information maintained by the JIT engine */
gpointer runtime_info;

4
mono/metadata/domain.c
View File

@@ -1239,10 +1239,6 @@ mono_domain_free (MonoDomain *domain, gboolean force)
g_hash_table_destroy (domain->generic_virtual_cases);
domain->generic_virtual_cases = NULL;
}
if (domain->generic_virtual_thunks) {
g_hash_table_destroy (domain->generic_virtual_thunks);
domain->generic_virtual_thunks = NULL;
}
if (domain->ftnptrs_hash) {
g_hash_table_destroy (domain->ftnptrs_hash);
domain->ftnptrs_hash = NULL;

2
mono/metadata/object.c.REMOVED.git-id
View File

@@ -1 +1 @@
f827cb16009ae47f3c9018b424c91bac7bf1214e
d5b8dd5db52f5b2af9fca12c6c39209d7f1e8cfc

2
mono/mini/Makefile.am
View File

@@ -824,7 +824,7 @@ EXTRA_DIST = TestDriver.cs \
Makefile.am.in
version.h: Makefile
echo "#define FULL_VERSION \"Stable 4.6.1.5/ef43c15\"" > version.h
echo "#define FULL_VERSION \"Stable 4.6.2.6/db69866\"" > version.h
# Utility target for patching libtool to speed up linking
patch-libtool:

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

@@ -824,7 +824,7 @@ EXTRA_DIST = TestDriver.cs \
Makefile.am.in
version.h: Makefile
echo "#define FULL_VERSION \"Stable 4.6.1.5/ef43c15\"" > version.h
echo "#define FULL_VERSION \"Stable 4.6.2.6/db69866\"" > 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 @@
af57916ed7a1e484a212d0ac404d689861bcb022
f219af2692be7d8f8ddc330d4241f4fa99446213

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

@@ -1 +1 @@
013d44207d4a363ed79bb112074971361023c73e
f1499dd86dfa96b2daff903a17b06f8d4f099923

2
mono/mini/method-to-ir.c.REMOVED.git-id
View File

@@ -1 +1 @@
a907decc82e6ebd6fbd2f02741729d50fcfe07b4
c997ed5af31cb98c0f5784fe9ae8fd20edb74fc5

2
mono/mini/version.h
View File

@@ -1 +1 @@
#define FULL_VERSION "Stable 4.6.1.5/ef43c15"
#define FULL_VERSION "Stable 4.6.2.6/db69866"

2
mono/profiler/proflog.c.REMOVED.git-id
View File

@@ -1 +1 @@
40e4187280464b96aac6aa5ea5d1f8539689ea02
874d8ba620ea8fa42ef506799e1dde438a2ecd10

8
mono/utils/mono-threads.c
View File

@@ -1190,7 +1190,7 @@ sleep_interruptable (guint32 ms, gboolean *alerted)
*alerted = FALSE;
if (ms != INFINITE)
end = mono_100ns_ticks () + (ms * 1000 * 10);
end = mono_msec_ticks() + ms;
mono_lazy_initialize (&sleep_init, sleep_initialize);
@@ -1198,8 +1198,8 @@ sleep_interruptable (guint32 ms, gboolean *alerted)
for (;;) {
if (ms != INFINITE) {
now = mono_100ns_ticks ();
if (now > end)
now = mono_msec_ticks();
if (now >= end)
break;
}
@@ -1210,7 +1210,7 @@ sleep_interruptable (guint32 ms, gboolean *alerted)
}
if (ms != INFINITE)
mono_coop_cond_timedwait (&sleep_cond, &sleep_mutex, (end - now) / 10 / 1000);
mono_coop_cond_timedwait (&sleep_cond, &sleep_mutex, end - now);
else
mono_coop_cond_wait (&sleep_cond, &sleep_mutex);