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

Imported Upstream version 4.0.3.13

Browse Source 
Former-commit-id: 4f1f69b42e04def9a697c2550b23b9cae645ef29
This commit is contained in:
Xamarin Public Jenkins
2015-07-20 03:39:00 -04:00
parent 4cee7df5e0
commit 2c051c3d51
138 changed files with 3829 additions and 206 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
mono/metadata/debug-helpers.c
View File

@@ -82,9 +82,11 @@ append_class_name (GString *res, MonoClass *class, gboolean include_namespace)
append_class_name (res, class->nested_in, include_namespace);
g_string_append_c (res, '/');
}
if (include_namespace && *(class->name_space))
g_string_append_printf (res, "%s.", class->name_space);
g_string_append_printf (res, "%s", class->name);
if (include_namespace && *(class->name_space)) {
g_string_append (res, class->name_space);
g_string_append_c (res, '.');
}
g_string_append (res, class->name);
}
static MonoClass*

10
mono/metadata/loader.c
View File

@@ -1491,7 +1491,7 @@ mono_lookup_pinvoke_call (MonoMethod *method, const char **exc_class, const char
/*
* Try loading the module using a variety of names
*/
for (i = 0; i < 4; ++i) {
for (i = 0; i < 5; ++i) {
char *base_name = NULL, *dir_name = NULL;
gboolean is_absolute = is_absolute_path (new_scope);
@@ -1525,6 +1525,14 @@ mono_lookup_pinvoke_call (MonoMethod *method, const char **exc_class, const char
break;
}
continue;
case 3:
if (!is_absolute && mono_dl_get_system_dir ()) {
dir_name = mono_dl_get_system_dir ();
file_name = g_path_get_basename (new_scope);
base_name = NULL;
} else
continue;
break;
default:
#ifndef TARGET_WIN32
if (!g_ascii_strcasecmp ("user32.dll", new_scope) ||

2
mono/mini/Makefile.am
View File

@@ -758,7 +758,7 @@ EXTRA_DIST = TestDriver.cs ldscript ldscript.mono \
Makefile.am.in
version.h: Makefile
echo "#define FULL_VERSION \"Stable 4.0.2.5/c99aa0c\"" > version.h
echo "#define FULL_VERSION \"Stable 4.0.3.13/429313d\"" > version.h
# Utility target for patching libtool to speed up linking
patch-libtool:

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

@@ -758,7 +758,7 @@ EXTRA_DIST = TestDriver.cs ldscript ldscript.mono \
Makefile.am.in
version.h: Makefile
echo "#define FULL_VERSION \"Stable 4.0.2.5/c99aa0c\"" > version.h
echo "#define FULL_VERSION \"Stable 4.0.3.13/429313d\"" > 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 @@
07a0c8c1ddf80aee829b97c5ba84b3a569a43636
69eae9968f7637f83f0e9f91850e8f2a9d4c4ad8

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

@@ -1 +1 @@
3a7fd76d7bfbda58972705ab20fe87bd61bfe4b8
88c8d341bb0f54aa9ec1b76bdbe96882b35da8fc

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

@@ -1 +1 @@
4f6e190e7870c918795d049c7ac2c574b773529c
f60b2e44986c523649dca9a101b12b8f2bfe5f11

8
mono/mini/basic-float.cs
View File

@@ -812,5 +812,13 @@ class Tests
short b = (short)a;
return b == 127 ? 0 : 1;
}
public static int test_10_rconv_to_u8 () {
ulong l = 10;
float f = (float)l;
l = (ulong)f;
return (int)l;
}
}

6
mono/mini/jit-icalls.c
View File

@@ -844,6 +844,12 @@ mono_fconv_u8 (double v)
return (guint64)v;
}
guint64
mono_rconv_u8 (float v)
{
return (guint64)v;
}
#ifdef MONO_ARCH_EMULATE_FCONV_TO_I8
gint64
mono_fconv_i8 (double v)

2
mono/mini/jit-icalls.h
View File

@@ -67,6 +67,8 @@ gpointer mono_ldtoken_wrapper_generic_shared (MonoImage *image, int token, MonoM
guint64 mono_fconv_u8 (double v) MONO_INTERNAL;
guint64 mono_rconv_u8 (float v) MONO_INTERNAL;
gint64 mono_fconv_i8 (double v) MONO_INTERNAL;
guint32 mono_fconv_u4 (double v) MONO_INTERNAL;

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

@@ -1 +1 @@
2db8d861eff4843bacec8f1b86cc931e68850d75
0521f4e014d9432948a7095ecc78a1d548a6213d

2
mono/mini/version.h
View File

@@ -1 +1 @@
#define FULL_VERSION "Stable 4.0.2.5/c99aa0c"
#define FULL_VERSION "Stable 4.0.3.13/429313d"

11
mono/utils/mono-dl-darwin.c
View File

@@ -50,4 +50,15 @@ mono_dl_get_executable_path (char *buf, int buflen)
return -1;
}
const char*
mono_dl_get_system_dir (void)
{
#ifdef TARGET_IOS
/* IOS9 can't load system libraries using relative paths, i.e. 'libc' doesn't work, but '/usr/lib/libc' does. */
return "/usr/lib";
#else
return NULL;
#endif
}
#endif

7
mono/utils/mono-dl-posix.c
View File

@@ -47,6 +47,13 @@ mono_dl_get_executable_path (char *buf, int buflen)
{
return readlink ("/proc/self/exe", buf, buflen - 1);
}
const char*
mono_dl_get_system_dir (void)
{
return NULL;
}
#endif
void *

6
mono/utils/mono-dl-windows.c
View File

@@ -159,4 +159,10 @@ mono_dl_get_executable_path (char *buf, int buflen)
return -1; //TODO
}
const char*
mono_dl_get_system_dir (void)
{
return NULL;
}
#endif

2
mono/utils/mono-dl.h
View File

@@ -34,7 +34,6 @@ char* mono_dl_build_path (const char *directory, const char *name, void **
MonoDl* mono_dl_open_runtime_lib (const char *lib_name, int flags, char **error_msg) MONO_INTERNAL;
//Platform API for mono_dl
const char* mono_dl_get_so_prefix (void) MONO_INTERNAL;
const char** mono_dl_get_so_suffixes (void) MONO_INTERNAL;
void* mono_dl_open_file (const char *file, int flags) MONO_INTERNAL;
@@ -43,6 +42,7 @@ void* mono_dl_lookup_symbol (MonoDl *module, const char *name) MONO_INTERNAL;
int mono_dl_convert_flags (int flags) MONO_INTERNAL;
char* mono_dl_current_error_string (void) MONO_INTERNAL;
int mono_dl_get_executable_path (char *buf, int buflen) MONO_INTERNAL;
const char* mono_dl_get_system_dir (void);
#endif /* __MONO_UTILS_DL_H__ */