diff --git a/configure.REMOVED.git-id b/configure.REMOVED.git-id index 1c7887c91f..d78decc365 100644 --- a/configure.REMOVED.git-id +++ b/configure.REMOVED.git-id @@ -1 +1 @@ -ce2dd70081b10fc07545b674f66612013c842eb7 \ No newline at end of file +9ac85c782a83860a87f003687da80e393c54c74c \ No newline at end of file diff --git a/configure.ac.REMOVED.git-id b/configure.ac.REMOVED.git-id index dc73251f27..0d6721e345 100644 --- a/configure.ac.REMOVED.git-id +++ b/configure.ac.REMOVED.git-id @@ -1 +1 @@ -fa5977bb752c6bb7aa22669e6857d309df993ed3 \ No newline at end of file +9959c554e0df45bd3fc3c220ac2486a819e91cd7 \ No newline at end of file diff --git a/mono/metadata/Makefile.am b/mono/metadata/Makefile.am index 16575ecc67..945e2e3e10 100644 --- a/mono/metadata/Makefile.am +++ b/mono/metadata/Makefile.am @@ -92,7 +92,7 @@ mono-config-dirs.lo: Makefile libmonoruntime_config_la_SOURCES = \ mono-config-dirs.h \ mono-config-dirs.c -libmonoruntime_config_la_CPPFLAGS = $(AM_CPPFLAGS) -DMONO_BINDIR=\"$(bindir)/\" -DMONO_ASSEMBLIES=\"$(assembliesdir)\" -DMONO_CFG_DIR=\"$(confdir)\" +libmonoruntime_config_la_CPPFLAGS = $(AM_CPPFLAGS) -DMONO_BINDIR=\"$(bindir)/\" -DMONO_ASSEMBLIES=\"$(assembliesdir)\" -DMONO_CFG_DIR=\"$(confdir)\" -DMONO_RELOC_LIBDIR=\"../$(reloc_libdir)\" CLEANFILES = mono-bundle.stamp diff --git a/mono/metadata/Makefile.in.REMOVED.git-id b/mono/metadata/Makefile.in.REMOVED.git-id index 1bf25d434b..72245f96ec 100644 --- a/mono/metadata/Makefile.in.REMOVED.git-id +++ b/mono/metadata/Makefile.in.REMOVED.git-id @@ -1 +1 @@ -e5365ceab10db097e26594b511bae0ad84084843 \ No newline at end of file +dc3f3bad1b3f37f98d76013d07f5698f239a1d46 \ No newline at end of file diff --git a/mono/metadata/appdomain.c b/mono/metadata/appdomain.c index 2c13387cc0..2767ac8a61 100644 --- a/mono/metadata/appdomain.c +++ b/mono/metadata/appdomain.c @@ -58,6 +58,7 @@ #include #include #include +#include #include #include #include @@ -343,8 +344,14 @@ mono_check_corlib_version (void) int version = mono_get_corlib_version (); if (version != MONO_CORLIB_VERSION) return g_strdup_printf ("expected corlib version %d, found %d.", MONO_CORLIB_VERSION, version); - else - return NULL; + + /* Check that the managed and unmanaged layout of MonoInternalThread matches */ + guint32 native_offset = (guint32) MONO_STRUCT_OFFSET (MonoInternalThread, last); + guint32 managed_offset = mono_field_get_offset (mono_class_get_field_from_name (mono_defaults.internal_thread_class, "last")); + if (native_offset != managed_offset) + return g_strdup_printf ("expected InternalThread.last field offset %u, found %u. See InternalThread.last comment", native_offset, managed_offset); + + return NULL; } /** diff --git a/mono/metadata/assembly.c.REMOVED.git-id b/mono/metadata/assembly.c.REMOVED.git-id index 7892bef234..f2d0f970b4 100644 --- a/mono/metadata/assembly.c.REMOVED.git-id +++ b/mono/metadata/assembly.c.REMOVED.git-id @@ -1 +1 @@ -f3feda4554cd8067c41f9d7baacaaf0d00bb7b02 \ No newline at end of file +6319d6539ae88d35e1b1c3ac49c5be5c39e309a0 \ No newline at end of file diff --git a/mono/metadata/assembly.h b/mono/metadata/assembly.h index 556981f493..cc080d2a6c 100644 --- a/mono/metadata/assembly.h +++ b/mono/metadata/assembly.h @@ -36,7 +36,8 @@ MONO_API MonoImage* mono_assembly_load_module (MonoAssembly *assembly, uint32 MONO_API void mono_assembly_close (MonoAssembly *assembly); MONO_API void mono_assembly_setrootdir (const char *root_dir); MONO_API MONO_CONST_RETURN char *mono_assembly_getrootdir (void); -MONO_API void mono_assembly_foreach (MonoFunc func, void* user_data); +MONO_API char *mono_native_getrootdir (void); +MONO_API void mono_assembly_foreach (MonoFunc func, void* user_data); MONO_API void mono_assembly_set_main (MonoAssembly *assembly); MONO_API MonoAssembly *mono_assembly_get_main (void); MONO_API MonoImage *mono_assembly_get_image (MonoAssembly *assembly); diff --git a/mono/metadata/mono-config-dirs.c b/mono/metadata/mono-config-dirs.c index ece67d1286..2e61a1b337 100644 --- a/mono/metadata/mono-config-dirs.c +++ b/mono/metadata/mono-config-dirs.c @@ -41,3 +41,13 @@ mono_config_get_bin_dir (void) #endif } +const char* +mono_config_get_reloc_lib_dir (void) +{ +#ifdef MONO_RELOC_LIBDIR + return MONO_RELOC_LIBDIR; +#else + return NULL; +#endif +} + diff --git a/mono/metadata/mono-config-dirs.h b/mono/metadata/mono-config-dirs.h index 9488511bde..25e7651225 100644 --- a/mono/metadata/mono-config-dirs.h +++ b/mono/metadata/mono-config-dirs.h @@ -13,4 +13,7 @@ mono_config_get_cfg_dir (void); const char* mono_config_get_bin_dir (void); +const char* +mono_config_get_reloc_lib_dir (void); + #endif diff --git a/mono/metadata/mono-config.c b/mono/metadata/mono-config.c index 2bedf12cd8..fe82c2e037 100644 --- a/mono/metadata/mono-config.c +++ b/mono/metadata/mono-config.c @@ -314,13 +314,14 @@ dllmap_start (gpointer user_data, else if (strcmp (attribute_names [i], "target") == 0){ char *p = strstr (attribute_values [i], "$mono_libdir"); if (p != NULL){ - const char *libdir = mono_assembly_getrootdir (); + char *libdir = mono_native_getrootdir (); size_t libdir_len = strlen (libdir); char *result; result = (char *)g_malloc (libdir_len-strlen("$mono_libdir")+strlen(attribute_values[i])+1); strncpy (result, attribute_values[i], p-attribute_values[i]); strcpy (result+(p-attribute_values[i]), libdir); + g_free (libdir); strcat (result, p+strlen("$mono_libdir")); info->target = result; } else diff --git a/mono/metadata/threads.c.REMOVED.git-id b/mono/metadata/threads.c.REMOVED.git-id index 046b6ab3e6..a09b38a06a 100644 --- a/mono/metadata/threads.c.REMOVED.git-id +++ b/mono/metadata/threads.c.REMOVED.git-id @@ -1 +1 @@ -4640b4a486524167b883c296cbfb15f3ed049a00 \ No newline at end of file +8382e814e861d3efb5e96fea040081825be4a793 \ No newline at end of file diff --git a/mono/mini/Makefile.am b/mono/mini/Makefile.am index 81e79f2837..f3cb47c226 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.374/5e1b0a0\"" > version.h + echo "#define FULL_VERSION \"Stable 4.8.0.382/aca1492\"" > 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 81e79f2837..f3cb47c226 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.374/5e1b0a0\"" > version.h + echo "#define FULL_VERSION \"Stable 4.8.0.382/aca1492\"" > 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 50179631a7..66a1094c9d 100644 --- a/mono/mini/Makefile.in.REMOVED.git-id +++ b/mono/mini/Makefile.in.REMOVED.git-id @@ -1 +1 @@ -bd2dc970d2cd2bab2dd66387eacff13809c8b08a \ No newline at end of file +de8ec0d53c8240e10d3267814eb8ab2f2114e5db \ No newline at end of file diff --git a/mono/mini/mini-llvm.c.REMOVED.git-id b/mono/mini/mini-llvm.c.REMOVED.git-id index 3027178162..87536d393e 100644 --- a/mono/mini/mini-llvm.c.REMOVED.git-id +++ b/mono/mini/mini-llvm.c.REMOVED.git-id @@ -1 +1 @@ -b83c823acfb57b9c0df3e1d56790906fa106dae8 \ No newline at end of file +ab39f1742452b15a924e23d558c2cb121503bc6c \ No newline at end of file diff --git a/mono/mini/version.h b/mono/mini/version.h index c87ef383c4..db614e72f4 100644 --- a/mono/mini/version.h +++ b/mono/mini/version.h @@ -1 +1 @@ -#define FULL_VERSION "Stable 4.8.0.374/5e1b0a0" +#define FULL_VERSION "Stable 4.8.0.382/aca1492" diff --git a/po/mcs/de.gmo b/po/mcs/de.gmo index 773dc839b7..047e830c66 100644 Binary files a/po/mcs/de.gmo and b/po/mcs/de.gmo differ diff --git a/po/mcs/de.po.REMOVED.git-id b/po/mcs/de.po.REMOVED.git-id index b58772e5eb..fc9e06a902 100644 --- a/po/mcs/de.po.REMOVED.git-id +++ b/po/mcs/de.po.REMOVED.git-id @@ -1 +1 @@ -0cbead8f0573d2cead8a1bc577181d4ae9095e50 \ No newline at end of file +470d10a95e73968e4ca69002f84128ce73370042 \ No newline at end of file diff --git a/po/mcs/es.gmo b/po/mcs/es.gmo index 5db1d10248..b3b92acea6 100644 Binary files a/po/mcs/es.gmo and b/po/mcs/es.gmo differ diff --git a/po/mcs/es.po.REMOVED.git-id b/po/mcs/es.po.REMOVED.git-id index 971c105d65..19ca9049b7 100644 --- a/po/mcs/es.po.REMOVED.git-id +++ b/po/mcs/es.po.REMOVED.git-id @@ -1 +1 @@ -d9e362d4bf3058a3c0ebf4b47a1838d3f82fe0da \ No newline at end of file +87ec20f13077d1f449ce5298d25c43f68f5bfbe1 \ No newline at end of file diff --git a/po/mcs/ja.gmo b/po/mcs/ja.gmo index b41680354a..ea35e82454 100644 Binary files a/po/mcs/ja.gmo and b/po/mcs/ja.gmo differ diff --git a/po/mcs/ja.po.REMOVED.git-id b/po/mcs/ja.po.REMOVED.git-id index e33137a2a4..170fe50441 100644 --- a/po/mcs/ja.po.REMOVED.git-id +++ b/po/mcs/ja.po.REMOVED.git-id @@ -1 +1 @@ -3eba478262d3247ca64c6221277a01ea605062c7 \ No newline at end of file +9779d03951635bee11c7bb3abeabfab8ea034814 \ No newline at end of file diff --git a/po/mcs/mcs.pot b/po/mcs/mcs.pot index c31f7c74a8..89ca1b4767 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-12-05 19:24+0000\n" +"POT-Creation-Date: 2016-12-15 12:17+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 75d0e0299d..28f476d192 100644 Binary files a/po/mcs/pt_BR.gmo and b/po/mcs/pt_BR.gmo differ diff --git a/po/mcs/pt_BR.po.REMOVED.git-id b/po/mcs/pt_BR.po.REMOVED.git-id index cd8d11ed18..66515319f9 100644 --- a/po/mcs/pt_BR.po.REMOVED.git-id +++ b/po/mcs/pt_BR.po.REMOVED.git-id @@ -1 +1 @@ -565333991ccab0166ccd8d9fc1b80f2f08d79e84 \ No newline at end of file +209d5ef3ae3062473db1c6aad92f4655f893ac0d \ No newline at end of file