Merge branch 'upstream'
Former-commit-id: b771b96c62fe0050d95d64c48bb085e35e11be25
This commit is contained in:
Xamarin Public Jenkins (auto-signing)
commit
5fe8dbdf05
@ -1 +1 @@
|
||||
3f0d7de26eb06e696651f0eb54e2feb5e8da4294
|
||||
3ba21059031b27874a35373e00bdcd91bd47de13
|
||||
@ -1 +1 @@
|
||||
891b77322f23307c9bf054b7c13d05d760b9f650
|
||||
e18300135ca50e7668c69f3ed3cd61dd3558d856
|
||||
2
external/bockbuild/packages/gtk-sharp.py
vendored
2
external/bockbuild/packages/gtk-sharp.py
vendored
@ -4,7 +4,7 @@ class GtkSharp212ReleasePackage (Package):
|
||||
Package.__init__(self, 'gtk-sharp',
|
||||
sources=['git://github.com/mono/gtk-sharp.git'],
|
||||
git_branch='gtk-sharp-2-12-branch',
|
||||
revision='6a98cdb3414a760d44eee5bd4b17224a6762d7ad',
|
||||
revision='dedce8ddbe37ae467f18ff785255e04fd9ccd782',
|
||||
override_properties={
|
||||
'configure': './bootstrap-2.12 --prefix=%{package_prefix}',
|
||||
}
|
||||
|
||||
@ -41,7 +41,7 @@ static partial class Consts
|
||||
// Use these assembly version constants to make code more maintainable.
|
||||
//
|
||||
|
||||
public const string MonoVersion = "6.6.0.133";
|
||||
public const string MonoVersion = "6.6.0.140";
|
||||
public const string MonoCompany = "Mono development team";
|
||||
public const string MonoProduct = "Mono Common Language Infrastructure";
|
||||
public const string MonoCopyright = "(c) Various Mono authors";
|
||||
|
||||
@ -1 +1 @@
|
||||
7c0fc742e67ebd432c14b6b616747368cbc5080a
|
||||
454ae59b63749df1c592dc2130fa7213b2ef0e9c
|
||||
@ -1 +1 @@
|
||||
4aa0eea6dca3dbd14a424eb9a5fe3fc4b76cbd3f
|
||||
a5c6aed95ba8bc49e3c1b969120cb70f6718271d
|
||||
@ -1 +1 @@
|
||||
0b9f8d1e37f9c05962c7898562f1f574dfabb0dc
|
||||
912f8605f6a11f646d7e49ab09f34a1701fd9a3d
|
||||
@ -1 +1 @@
|
||||
29cb409d7fba33bd16be5379f326276c7f810d0f
|
||||
358ce5082e789676e06fdf6e7a1279f4186d31a7
|
||||
@ -1 +1 @@
|
||||
19412dd30bb7279a59d82b7da07ccbe8307a1a3b
|
||||
40787214b81a44904dfc445b7ad3740600a06e89
|
||||
@ -1 +1 @@
|
||||
386226aa05d1283286ef664640d8cd9695907824
|
||||
24a1d0f66f4ff5e1eab59634988bbf3cf879f335
|
||||
@ -1 +1 @@
|
||||
83ac4ed1a4cb6da6e6796ecb5e8f44cef1be242c
|
||||
8b6dc65e0cbc140249fa33142feac2235b0940ed
|
||||
@ -1 +1 @@
|
||||
7c0fc742e67ebd432c14b6b616747368cbc5080a
|
||||
454ae59b63749df1c592dc2130fa7213b2ef0e9c
|
||||
@ -1 +1 @@
|
||||
4aa0eea6dca3dbd14a424eb9a5fe3fc4b76cbd3f
|
||||
a5c6aed95ba8bc49e3c1b969120cb70f6718271d
|
||||
@ -1 +1 @@
|
||||
0b9f8d1e37f9c05962c7898562f1f574dfabb0dc
|
||||
912f8605f6a11f646d7e49ab09f34a1701fd9a3d
|
||||
@ -1 +1 @@
|
||||
29cb409d7fba33bd16be5379f326276c7f810d0f
|
||||
358ce5082e789676e06fdf6e7a1279f4186d31a7
|
||||
@ -1 +1 @@
|
||||
19412dd30bb7279a59d82b7da07ccbe8307a1a3b
|
||||
40787214b81a44904dfc445b7ad3740600a06e89
|
||||
@ -1 +1 @@
|
||||
386226aa05d1283286ef664640d8cd9695907824
|
||||
24a1d0f66f4ff5e1eab59634988bbf3cf879f335
|
||||
@ -1 +1 @@
|
||||
eabf1317215f7103b2ee8a2347ba0fa285af848a
|
||||
ac98f66f66258581ca21c1de9aa4f3802362d63b
|
||||
@ -1 +1 @@
|
||||
83ac4ed1a4cb6da6e6796ecb5e8f44cef1be242c
|
||||
8b6dc65e0cbc140249fa33142feac2235b0940ed
|
||||
@ -1 +1 @@
|
||||
7c0fc742e67ebd432c14b6b616747368cbc5080a
|
||||
454ae59b63749df1c592dc2130fa7213b2ef0e9c
|
||||
@ -1 +1 @@
|
||||
4aa0eea6dca3dbd14a424eb9a5fe3fc4b76cbd3f
|
||||
a5c6aed95ba8bc49e3c1b969120cb70f6718271d
|
||||
@ -1 +1 @@
|
||||
0b9f8d1e37f9c05962c7898562f1f574dfabb0dc
|
||||
912f8605f6a11f646d7e49ab09f34a1701fd9a3d
|
||||
@ -1 +1 @@
|
||||
29cb409d7fba33bd16be5379f326276c7f810d0f
|
||||
358ce5082e789676e06fdf6e7a1279f4186d31a7
|
||||
@ -1 +1 @@
|
||||
19412dd30bb7279a59d82b7da07ccbe8307a1a3b
|
||||
40787214b81a44904dfc445b7ad3740600a06e89
|
||||
@ -1 +1 @@
|
||||
386226aa05d1283286ef664640d8cd9695907824
|
||||
24a1d0f66f4ff5e1eab59634988bbf3cf879f335
|
||||
@ -1 +1 @@
|
||||
eabf1317215f7103b2ee8a2347ba0fa285af848a
|
||||
ac98f66f66258581ca21c1de9aa4f3802362d63b
|
||||
@ -1 +1 @@
|
||||
83ac4ed1a4cb6da6e6796ecb5e8f44cef1be242c
|
||||
8b6dc65e0cbc140249fa33142feac2235b0940ed
|
||||
@ -1 +1 @@
|
||||
7c0fc742e67ebd432c14b6b616747368cbc5080a
|
||||
454ae59b63749df1c592dc2130fa7213b2ef0e9c
|
||||
@ -1 +1 @@
|
||||
4aa0eea6dca3dbd14a424eb9a5fe3fc4b76cbd3f
|
||||
a5c6aed95ba8bc49e3c1b969120cb70f6718271d
|
||||
@ -1 +1 @@
|
||||
ba640b205bf9fb1e497b8e1ca68312b85a66d5b3
|
||||
16e2e3adf1a2a080499bc5855e0b65eee61d4a97
|
||||
@ -1 +1 @@
|
||||
29cb409d7fba33bd16be5379f326276c7f810d0f
|
||||
358ce5082e789676e06fdf6e7a1279f4186d31a7
|
||||
@ -1 +1 @@
|
||||
19412dd30bb7279a59d82b7da07ccbe8307a1a3b
|
||||
40787214b81a44904dfc445b7ad3740600a06e89
|
||||
@ -1 +1 @@
|
||||
386226aa05d1283286ef664640d8cd9695907824
|
||||
24a1d0f66f4ff5e1eab59634988bbf3cf879f335
|
||||
@ -1 +1 @@
|
||||
eabf1317215f7103b2ee8a2347ba0fa285af848a
|
||||
ac98f66f66258581ca21c1de9aa4f3802362d63b
|
||||
@ -1 +1 @@
|
||||
d704d5d4f1b92241acc54dd43a7dfd89c7079d01
|
||||
fdfe40a5a91f2b3d7b9e372889b8b2b2e27b8745
|
||||
@ -861,12 +861,14 @@ prepare_for_guard_pages (MonoContext *mctx)
|
||||
}
|
||||
|
||||
static void
|
||||
altstack_handle_and_restore (MonoContext *ctx, MonoObject *obj, gboolean stack_ovf)
|
||||
altstack_handle_and_restore (MonoContext *ctx, MonoObject *obj, guint32 flags)
|
||||
{
|
||||
MonoContext mctx;
|
||||
MonoJitInfo *ji = mini_jit_info_table_find (mono_domain_get (), MONO_CONTEXT_GET_IP (ctx), NULL);
|
||||
gboolean stack_ovf = (flags & 1) != 0;
|
||||
gboolean nullref = (flags & 2) != 0;
|
||||
|
||||
if (!ji)
|
||||
if (!ji || (!stack_ovf && !nullref))
|
||||
mono_handle_native_crash ("SIGSEGV", ctx, NULL);
|
||||
|
||||
mctx = *ctx;
|
||||
@ -888,6 +890,10 @@ mono_arch_handle_altstack_exception (void *sigctx, MONO_SIG_HANDLER_INFO_TYPE *s
|
||||
gpointer *sp;
|
||||
int frame_size;
|
||||
MonoContext *copied_ctx;
|
||||
gboolean nullref = TRUE;
|
||||
|
||||
if (!mono_is_addr_implicit_null_check (fault_addr))
|
||||
nullref = FALSE;
|
||||
|
||||
if (stack_ovf)
|
||||
exc = mono_domain_get ()->stack_overflow_ex;
|
||||
@ -914,7 +920,7 @@ mono_arch_handle_altstack_exception (void *sigctx, MONO_SIG_HANDLER_INFO_TYPE *s
|
||||
UCONTEXT_REG_RSP (sigctx) = (unsigned long)(sp - 1);
|
||||
UCONTEXT_REG_RDI (sigctx) = (unsigned long)(copied_ctx);
|
||||
UCONTEXT_REG_RSI (sigctx) = (guint64)exc;
|
||||
UCONTEXT_REG_RDX (sigctx) = stack_ovf;
|
||||
UCONTEXT_REG_RDX (sigctx) = (stack_ovf ? 1 : 0) | (nullref ? 2 : 0);
|
||||
#endif
|
||||
}
|
||||
|
||||
|
||||
@ -1 +1 @@
|
||||
4cf065806b5f00551b85dba0e65c32133b9353b5
|
||||
92b47e1786fd50b90c2674b0737ae4562363279a
|
||||
@ -555,6 +555,9 @@ mono_dump_native_crash_info (const char *signal, MonoContext *mctx, MONO_SIG_HAN
|
||||
void
|
||||
mono_post_native_crash_handler (const char *signal, MonoContext *mctx, MONO_SIG_HANDLER_INFO_TYPE *info, gboolean crash_chaining);
|
||||
|
||||
gboolean
|
||||
mono_is_addr_implicit_null_check (void *addr);
|
||||
|
||||
/*
|
||||
* Signal handling
|
||||
*/
|
||||
|
||||
@ -1 +1 @@
|
||||
#define FULL_VERSION "explicit/baa12e5"
|
||||
#define FULL_VERSION "explicit/1b2e536"
|
||||
|
||||
@ -1496,10 +1496,10 @@ distclean-generic:
|
||||
maintainer-clean-generic:
|
||||
@echo "This command is intended for maintainers to use"
|
||||
@echo "it deletes files that may require special tools to rebuild."
|
||||
@CROSS_COMPILE_TRUE@test-local:
|
||||
@HOST_WIN32_TRUE@test-local:
|
||||
@CROSS_COMPILE_TRUE@clean-local:
|
||||
@HOST_WIN32_TRUE@clean-local:
|
||||
@CROSS_COMPILE_TRUE@test-local:
|
||||
@HOST_WIN32_TRUE@test-local:
|
||||
clean: clean-am
|
||||
|
||||
clean-am: clean-checkPROGRAMS clean-generic clean-libtool clean-local \
|
||||
|
||||
BIN
po/mcs/de.gmo
BIN
po/mcs/de.gmo
Binary file not shown.
@ -1 +1 @@
|
||||
343ac949ba05c7f988fb08025570f6122b2f236b
|
||||
33a6cd4c47a6114d6e8f269d9b526e9a05f176fd
|
||||
BIN
po/mcs/es.gmo
BIN
po/mcs/es.gmo
Binary file not shown.
@ -1 +1 @@
|
||||
be560d6ec27a6f268765e2bd4c498dfaa270a0e1
|
||||
a2a6da1519eb04f905b8b9800a485bd1702c79b0
|
||||
BIN
po/mcs/ja.gmo
BIN
po/mcs/ja.gmo
Binary file not shown.
@ -1 +1 @@
|
||||
ecbb0ae4fa6aff2c870b610c3de5ec12f714b14a
|
||||
8e30ae2f6e48de6ca6ae66fd0733ad487e1ce33c
|
||||
@ -6,9 +6,9 @@
|
||||
#, fuzzy
|
||||
msgid ""
|
||||
msgstr ""
|
||||
"Project-Id-Version: mono 6.6.0.133\n"
|
||||
"Project-Id-Version: mono 6.6.0.140\n"
|
||||
"Report-Msgid-Bugs-To: http://www.mono-project.com/Bugs\n"
|
||||
"POT-Creation-Date: 2019-10-23 08:29+0000\n"
|
||||
"POT-Creation-Date: 2019-10-24 08:31+0000\n"
|
||||
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
|
||||
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
|
||||
"Language-Team: LANGUAGE <LL@li.org>\n"
|
||||
|
||||
BIN
po/mcs/pt_BR.gmo
BIN
po/mcs/pt_BR.gmo
Binary file not shown.
@ -1 +1 @@
|
||||
dc85ffcd2e8de040b54a5d4da1453718343aa1e8
|
||||
a8d5dcb96991368b9ee54e5d527fc4b81d538cc2
|
||||
Loading…
x
Reference in New Issue
Block a user