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

Merge branch 'upstream'

Browse Source 
Former-commit-id: a19345b5ba3d00140da3467d03c358bdd19a927d
This commit is contained in:
Xamarin Public Jenkins (auto-signing) 2016-12-15 12:42:53 +00:00
commit 61cdb32d83
25 changed files with 42 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
configure.REMOVED.git-id
View File

@ -1 +1 @@
ce2dd70081b10fc07545b674f66612013c842eb7 9ac85c782a83860a87f003687da80e393c54c74c

2
configure.ac.REMOVED.git-id
View File

@ -1 +1 @@
fa5977bb752c6bb7aa22669e6857d309df993ed3 9959c554e0df45bd3fc3c220ac2486a819e91cd7

2
mono/metadata/Makefile.am
View File

@ -92,7 +92,7 @@ mono-config-dirs.lo: Makefile
libmonoruntime_config_la_SOURCES = \ libmonoruntime_config_la_SOURCES = \
mono-config-dirs.h \ mono-config-dirs.h \
mono-config-dirs.c 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 CLEANFILES = mono-bundle.stamp

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

@ -1 +1 @@
e5365ceab10db097e26594b511bae0ad84084843 dc3f3bad1b3f37f98d76013d07f5698f239a1d46

11
mono/metadata/appdomain.c
View File

@ -58,6 +58,7 @@
#include <mono/metadata/tokentype.h> #include <mono/metadata/tokentype.h>
#include <mono/metadata/profiler-private.h> #include <mono/metadata/profiler-private.h>
#include <mono/metadata/reflection-internals.h> #include <mono/metadata/reflection-internals.h>
#include <mono/metadata/abi-details.h>
#include <mono/utils/mono-uri.h> #include <mono/utils/mono-uri.h>
#include <mono/utils/mono-logger-internals.h> #include <mono/utils/mono-logger-internals.h>
#include <mono/utils/mono-path.h> #include <mono/utils/mono-path.h>
@ -343,8 +344,14 @@ mono_check_corlib_version (void)
int version = mono_get_corlib_version (); int version = mono_get_corlib_version ();
if (version != MONO_CORLIB_VERSION) if (version != MONO_CORLIB_VERSION)
return g_strdup_printf ("expected corlib version %d, found %d.", MONO_CORLIB_VERSION, 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;
} }
/** /**

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

@ -1 +1 @@
f3feda4554cd8067c41f9d7baacaaf0d00bb7b02 6319d6539ae88d35e1b1c3ac49c5be5c39e309a0

3
mono/metadata/assembly.h
View File

@ -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_close (MonoAssembly *assembly);
MONO_API void mono_assembly_setrootdir (const char *root_dir); MONO_API void mono_assembly_setrootdir (const char *root_dir);
MONO_API MONO_CONST_RETURN char *mono_assembly_getrootdir (void); 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 void mono_assembly_set_main (MonoAssembly *assembly);
MONO_API MonoAssembly *mono_assembly_get_main (void); MONO_API MonoAssembly *mono_assembly_get_main (void);
MONO_API MonoImage *mono_assembly_get_image (MonoAssembly *assembly); MONO_API MonoImage *mono_assembly_get_image (MonoAssembly *assembly);

10
mono/metadata/mono-config-dirs.c
View File

@ -41,3 +41,13 @@ mono_config_get_bin_dir (void)
#endif #endif
} }
const char*
mono_config_get_reloc_lib_dir (void)
{
#ifdef MONO_RELOC_LIBDIR
return MONO_RELOC_LIBDIR;
#else
return NULL;
#endif
}

3
mono/metadata/mono-config-dirs.h
View File

@ -13,4 +13,7 @@ mono_config_get_cfg_dir (void);
const char* const char*
mono_config_get_bin_dir (void); mono_config_get_bin_dir (void);
const char*
mono_config_get_reloc_lib_dir (void);
#endif #endif

3
mono/metadata/mono-config.c
View File

@ -314,13 +314,14 @@ dllmap_start (gpointer user_data,
else if (strcmp (attribute_names [i], "target") == 0){ else if (strcmp (attribute_names [i], "target") == 0){
char *p = strstr (attribute_values [i], "$mono_libdir"); char *p = strstr (attribute_values [i], "$mono_libdir");
if (p != NULL){ if (p != NULL){
const char *libdir = mono_assembly_getrootdir (); char *libdir = mono_native_getrootdir ();
size_t libdir_len = strlen (libdir); size_t libdir_len = strlen (libdir);
char *result; char *result;
result = (char *)g_malloc (libdir_len-strlen("$mono_libdir")+strlen(attribute_values[i])+1); result = (char *)g_malloc (libdir_len-strlen("$mono_libdir")+strlen(attribute_values[i])+1);
strncpy (result, attribute_values[i], p-attribute_values[i]); strncpy (result, attribute_values[i], p-attribute_values[i]);
strcpy (result+(p-attribute_values[i]), libdir); strcpy (result+(p-attribute_values[i]), libdir);
g_free (libdir);
strcat (result, p+strlen("$mono_libdir")); strcat (result, p+strlen("$mono_libdir"));
info->target = result; info->target = result;
} else } else

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

@ -1 +1 @@
4640b4a486524167b883c296cbfb15f3ed049a00 8382e814e861d3efb5e96fea040081825be4a793

2
mono/mini/Makefile.am
View File

@ -860,7 +860,7 @@ EXTRA_DIST = TestDriver.cs \
Makefile.am.in Makefile.am.in
version.h: Makefile 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 # Utility target for patching libtool to speed up linking
patch-libtool: patch-libtool:

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

@ -860,7 +860,7 @@ EXTRA_DIST = TestDriver.cs \
Makefile.am.in Makefile.am.in
version.h: Makefile 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 # Utility target for patching libtool to speed up linking
patch-libtool: patch-libtool:

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

@ -1 +1 @@
bd2dc970d2cd2bab2dd66387eacff13809c8b08a de8ec0d53c8240e10d3267814eb8ab2f2114e5db

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

@ -1 +1 @@
b83c823acfb57b9c0df3e1d56790906fa106dae8 ab39f1742452b15a924e23d558c2cb121503bc6c

2
mono/mini/version.h
View File

@ -1 +1 @@
#define FULL_VERSION "Stable 4.8.0.374/5e1b0a0" #define FULL_VERSION "Stable 4.8.0.382/aca1492"

BIN
po/mcs/de.gmo
View File

Binary file not shown.

2
po/mcs/de.po.REMOVED.git-id
View File

@ -1 +1 @@
0cbead8f0573d2cead8a1bc577181d4ae9095e50 470d10a95e73968e4ca69002f84128ce73370042

BIN
po/mcs/es.gmo
View File

Binary file not shown.

2
po/mcs/es.po.REMOVED.git-id
View File

@ -1 +1 @@
d9e362d4bf3058a3c0ebf4b47a1838d3f82fe0da 87ec20f13077d1f449ce5298d25c43f68f5bfbe1

BIN
po/mcs/ja.gmo
View File

Binary file not shown.

2
po/mcs/ja.po.REMOVED.git-id
View File

@ -1 +1 @@
3eba478262d3247ca64c6221277a01ea605062c7 9779d03951635bee11c7bb3abeabfab8ea034814

2
po/mcs/mcs.pot
View File

@ -8,7 +8,7 @@ msgid ""
msgstr "" msgstr ""
"Project-Id-Version: mono 4.8.0\n" "Project-Id-Version: mono 4.8.0\n"
"Report-Msgid-Bugs-To: http://www.mono-project.com/Bugs\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" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n" "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
"Language-Team: LANGUAGE <LL@li.org>\n" "Language-Team: LANGUAGE <LL@li.org>\n"

BIN
po/mcs/pt_BR.gmo
View File

Binary file not shown.

2
po/mcs/pt_BR.po.REMOVED.git-id
View File

@ -1 +1 @@
565333991ccab0166ccd8d9fc1b80f2f08d79e84 209d5ef3ae3062473db1c6aad92f4655f893ac0d