Fix unset ZapRelocationType for fixup & Fixed Bug with xmm registry

on x86 emulator

Change-Id: I968632a549f777fc4e13d459b89f2c935237327b

3 files changed, 67 insertions, 1 deletions

diff --git a/packaging/0001-Fixed-Bug-with-xmm-registry-on-x86-emulator-183.patch b/packaging/0001-Fixed-Bug-with-xmm-registry-on-x86-emulator-183.patch
new file mode 100644
index 0000000000..bb4505dbfc
--- /dev/null
+++ b/packaging/0001-Fixed-Bug-with-xmm-registry-on-x86-emulator-183.patch
@@ -0,0 +1,37 @@
+From 0460b45de04e73dd4582b44586078dc07470cfb3 Mon Sep 17 00:00:00 2001
+From: Sergey Ignatov <sergign60@mail.ru>
+Date: Wed, 27 Jun 2018 12:00:18 +0300
+Subject: [PATCH 1/2] Fixed Bug with xmm registry on x86 emulator #183
+
+---
+ src/vm/i386/unixstubs.cpp | 6 +++---
+ 1 file changed, 3 insertions(+), 3 deletions(-)
+
+diff --git a/src/vm/i386/unixstubs.cpp b/src/vm/i386/unixstubs.cpp
+index a9b1094..9206844 100644
+--- a/src/vm/i386/unixstubs.cpp
++++ b/src/vm/i386/unixstubs.cpp
+@@ -11,17 +11,17 @@ extern "C"
+         PORTABILITY_ASSERT("Implement for PAL");
+     }
+ 
+-    void ProfileEnterNaked(FunctionIDOrClientID functionIDOrClientID)    
++    void __stdcall ProfileEnterNaked(FunctionIDOrClientID functionIDOrClientID)
+     {
+         PORTABILITY_ASSERT("Implement for PAL");
+     }
+ 
+-    void ProfileLeaveNaked(FunctionIDOrClientID functionIDOrClientID)
++    void __stdcall ProfileLeaveNaked(FunctionIDOrClientID functionIDOrClientID)
+     {
+         PORTABILITY_ASSERT("Implement for PAL");
+     }
+ 
+-    void ProfileTailcallNaked(FunctionIDOrClientID functionIDOrClientID)
++    void __stdcall ProfileTailcallNaked(FunctionIDOrClientID functionIDOrClientID)
+     {
+         PORTABILITY_ASSERT("Implement for PAL");
+     }
+-- 
+2.7.4
+
diff --git a/packaging/0002-Fix-unset-ZapRelocationType-for-fixup-18589.patch b/packaging/0002-Fix-unset-ZapRelocationType-for-fixup-18589.patch
new file mode 100644
index 0000000000..436df76a2d
--- /dev/null
+++ b/packaging/0002-Fix-unset-ZapRelocationType-for-fixup-18589.patch
@@ -0,0 +1,25 @@
+From 9696666633c05377e23776d2a1f93a701ff84d78 Mon Sep 17 00:00:00 2001
+From: Gleb Balykov <g.balykov@samsung.com>
+Date: Fri, 22 Jun 2018 01:16:58 +0300
+Subject: [PATCH 2/2] Fix unset ZapRelocationType for fixup (#18589)
+
+---
+ src/vm/dataimage.cpp | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/src/vm/dataimage.cpp b/src/vm/dataimage.cpp
+index 854f214..c0e737a 100644
+--- a/src/vm/dataimage.cpp
++++ b/src/vm/dataimage.cpp
+@@ -1467,7 +1467,7 @@ void DataImage::FixupTypeHandlePointer(TypeHandle th, PVOID p, SSIZE_T offset, Z
+         {
+             if (CanEagerBindToTypeHandle(th) && CanHardBindToZapModule(th.GetLoaderModule()))
+             {
+-                FixupField(p, offset, th.AsTypeDesc(), 2);
++                FixupField(p, offset, th.AsTypeDesc(), 2, type);
+             }
+             else
+             {
+-- 
+2.7.4
+
diff --git a/packaging/coreclr.spec b/packaging/coreclr.spec
index 35bce027b6..46c341bcd2 100644
--- a/packaging/coreclr.spec
+++ b/packaging/coreclr.spec
@@ -23,7 +23,7 @@ Source1000: downloaded_files.tar.gz
 Source1001: %{name}.manifest
 Source1002: libicu.tar.gz
 Source1003: dep_libs.tar.gz
-# Gbp-Ignore-Patches: 0 1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 20 21 22 23 24 25 26 27 28 29 30 31 32 33 34 35 36 37 38 39 40 41 42 43 44 45 46 47 48 49 50 51 52 53 54 55 56 57 58 59 60 61 62 63 64 65 66 67 68 69 70 71 72 73 74 75 76 77 78 79 80 81 82 83 84 85 86 87 88 89 90 91 92 93 94 95 96 97 98 99 100 101 102 103 104 105 106 107 108 109 110 111 112 113 114 115 116 117 118 119 120 121 122 123 124
+# Gbp-Ignore-Patches: 0 1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 20 21 22 23 24 25 26 27 28 29 30 31 32 33 34 35 36 37 38 39 40 41 42 43 44 45 46 47 48 49 50 51 52 53 54 55 56 57 58 59 60 61 62 63 64 65 66 67 68 69 70 71 72 73 74 75 76 77 78 79 80 81 82 83 84 85 86 87 88 89 90 91 92 93 94 95 96 97 98 99 100 101 102 103 104 105 106 107 108 109 110 111 112 113 114 115 116 117 118 119 120 121 122 123 124 125 126
 Patch0:     0001-Add-project.assets.json-files.patch
 Patch1:     0001-ARM-Linux-Support-unaligned-struct-read-write-11290.patch
 Patch2:     0002-x86-Linux-Thread-safe-UMThunkMarshInfo-RunTimeInit-1.patch
@@ -149,6 +149,8 @@ Patch121:    0044-Replace-push-pop-of-R11-in-stubs-with.patch
 Patch122:    0045-Replace-push-pop-of-R11-for-function-epilog-with-usa.patch
 Patch123:    0046-Remove-ifdef.patch
 Patch124:    0047-Launching-the-Memory-Profiler-on-x86-emulator-may-le.patch
+Patch125:    0001-Fixed-Bug-with-xmm-registry-on-x86-emulator-183.patch
+Patch126:    0002-Fix-unset-ZapRelocationType-for-fixup-18589.patch
 
 ExcludeArch: aarch64
 
@@ -375,6 +377,8 @@ cp %{SOURCE1001} .
 %patch122 -p1
 %patch123 -p1
 %patch124 -p1
+%patch125 -p1
+%patch126 -p1
 
 
 %if 0%{skipmscorlib}