Imported Upstream version 4.6.0.182

Former-commit-id: 439c182e520038bf50777ca2fe684f216ae28552
This commit is contained in:
Xamarin Public Jenkins (auto-signing)
2016-09-01 10:46:18 +00:00
parent c911219690
commit 804b15604f
118 changed files with 1007 additions and 891 deletions

View File

@@ -824,7 +824,7 @@ EXTRA_DIST = TestDriver.cs \
Makefile.am.in
version.h: Makefile
echo "#define FULL_VERSION \"Stable 4.6.0.165/23c6a4d\"" > version.h
echo "#define FULL_VERSION \"Stable 4.6.0.182/3ed2bba\"" > version.h
# Utility target for patching libtool to speed up linking
patch-libtool:

View File

@@ -824,7 +824,7 @@ EXTRA_DIST = TestDriver.cs \
Makefile.am.in
version.h: Makefile
echo "#define FULL_VERSION \"Stable 4.6.0.165/23c6a4d\"" > version.h
echo "#define FULL_VERSION \"Stable 4.6.0.182/3ed2bba\"" > version.h
# Utility target for patching libtool to speed up linking
patch-libtool:

View File

@@ -1 +1 @@
0a7bed95863ec573d057b5483fa32bf8b8784029
95fb4f0f463f11376bc66366d33b0ada31e655e7

View File

@@ -191,7 +191,9 @@ handle_instruction:
case OP_LOADU4_MEMBASE:
case OP_LOADI1_MEMBASE:
case OP_LOADI8_MEMBASE:
#ifndef MONO_ARCH_SOFT_FLOAT_FALLBACK
case OP_LOADR4_MEMBASE:
#endif
case OP_LOADR8_MEMBASE:
if (ins->inst_offset != 0)
continue;
@@ -211,7 +213,9 @@ handle_instruction:
case OP_STOREI2_MEMBASE_REG:
case OP_STOREI4_MEMBASE_REG:
case OP_STOREI8_MEMBASE_REG:
#ifndef MONO_ARCH_SOFT_FLOAT_FALLBACK
case OP_STORER4_MEMBASE_REG:
#endif
case OP_STORER8_MEMBASE_REG:
case OP_STOREV_MEMBASE:
if (ins->inst_offset != 0)

View File

@@ -1 +1 @@
04d5b1fd041a94fe234652daf1ae896b2891ee66
013d44207d4a363ed79bb112074971361023c73e

View File

@@ -1889,6 +1889,13 @@ mono_local_emulate_ops (MonoCompile *cfg)
int op_noimm = mono_op_imm_to_op (ins->opcode);
MonoJitICallInfo *info;
/*
* These opcodes don't have logical equivalence to the emulating native
* function. They are decomposed in specific fashion in mono_decompose_soft_float.
*/
if (MONO_HAS_CUSTOM_EMULATION (ins))
continue;
/*
* Emulation can't handle _IMM ops. If this is an imm opcode we need
* to check whether its non-imm counterpart is emulated and, if so,

View File

@@ -1 +1 @@
527f141538965a4146bbb20c5f3d5c86cca254d0
2fe69c378a64914c4bb35bf1a52a00153609255b

View File

@@ -1 +1 @@
a26cd536b26205a3f69081a24c42314c0e520704
d1f83c4641b21eb86ef3a9291f1af35cf6f78be4

View File

@@ -1 +1 @@
#define FULL_VERSION "Stable 4.6.0.165/23c6a4d"
#define FULL_VERSION "Stable 4.6.0.182/3ed2bba"