diff options
Diffstat (limited to 'packaging/0002-Fix-unset-ZapRelocationType-for-fixup-18589.patch')
-rw-r--r-- | packaging/0002-Fix-unset-ZapRelocationType-for-fixup-18589.patch | 25 |
1 files changed, 25 insertions, 0 deletions
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 + |