Update to 4.0.9

3 files changed, 35 insertions, 8 deletions

diff --git a/.SRCINFO b/.SRCINFO
index edff344d8ed6..e25753eb755c 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,7 +1,7 @@
 pkgbase = remill-git
 	pkgdesc = Library for lifting of x86, amd64, and aarch64 machine code to LLVM bitcode
-	pkgver = v4.0.8.r0.g71c4d067
-	pkgrel = 2
+	pkgver = v4.0.9.r0.gbf69d9ca
+	pkgrel = 1
 	url = https://github.com/lifting-bits/remill
 	arch = x86_64
 	license = Apache
@@ -11,10 +11,13 @@ pkgbase = remill-git
 	depends = zlib
 	depends = lib32-glibc
 	depends = lib32-gcc-libs
+	depends = libunwind
 	provides = remill
 	conflicts = remill
 	source = remill-git::git+https://github.com/lifting-bits/remill.git
+	source = 00-fix-inst-CVTSI2SS.patch
 	sha256sums = SKIP
+	sha256sums = fdec38eee1c770df5625f93ac1e017449e6d76455bf279f6865887aef0d8ee7a
 
 pkgname = remill-git
 
diff --git a/00-fix-inst-CVTSI2SS.patch b/00-fix-inst-CVTSI2SS.patch
new file mode 100644
index 000000000000..d1ed7950e6d2
--- /dev/null
+++ b/00-fix-inst-CVTSI2SS.patch
@@ -0,0 +1,16 @@
+--- a/lib/Arch/X86/Semantics/CONVERT.cpp
++++ b/lib/Arch/X86/Semantics/CONVERT.cpp
+@@ -333,10 +333,10 @@
+ 
+ namespace {
+ template <typename S2>
+-DEF_SEM(CVTSI2SS, V128W dst_src1, S2 src2) {
+-  auto src1_vec = FReadV32(dst_src1);
++DEF_SEM(CVTSI2SS, V128W dst, V128 src1, S2 src2) {
++  auto src1_vec = FReadV32(src1);
+   auto conv_val = Float32(Signed(Read(src2)));
+-  FWriteV32(dst_src1, FInsertV32(src1_vec, 0, conv_val));
++  FWriteV32(dst, FInsertV32(src1_vec, 0, conv_val));
+   return memory;
+ }
+ 
diff --git a/PKGBUILD b/PKGBUILD
index 5b795d2d9afc..a4c2259c7779 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -2,19 +2,27 @@
 # Maintainer: Kuan-Yen Chou <kuanyenchou at gmail dot com>
 
 pkgname=remill-git
-pkgver=v4.0.8.r0.g71c4d067
-pkgrel=2
+pkgver=v4.0.9.r0.gbf69d9ca
+pkgrel=1
 pkgdesc="Library for lifting of x86, amd64, and aarch64 machine code to LLVM bitcode"
 arch=('x86_64')
 url="https://github.com/lifting-bits/remill"
 license=('Apache')
-depends=('cxx-common=0.0.14' 'ncurses' 'zlib' 'lib32-glibc' 'lib32-gcc-libs')
+depends=('cxx-common=0.0.14' 'ncurses' 'zlib' 'lib32-glibc' 'lib32-gcc-libs'
+         'libunwind')
 makedepends=('git')
 checkdepends=()
 provides=('remill')
 conflicts=('remill')
-source=("$pkgname::git+https://github.com/lifting-bits/remill.git")
-sha256sums=('SKIP')
+source=("$pkgname::git+https://github.com/lifting-bits/remill.git"
+        '00-fix-inst-CVTSI2SS.patch')
+sha256sums=('SKIP'
+            'fdec38eee1c770df5625f93ac1e017449e6d76455bf279f6865887aef0d8ee7a')
+
+prepare() {
+    cd "$srcdir/$pkgname"
+    patch -Np1 -i "$srcdir/00-fix-inst-CVTSI2SS.patch"
+}
 
 pkgver() {
     cd "$srcdir/$pkgname"
@@ -51,7 +59,7 @@ package() {
     cd "$srcdir/$pkgname/build"
     make DESTDIR="${pkgdir}" install
     sed -i "$pkgdir/usr/lib/cmake/remill/remillConfig.cmake" \
-        -e "s|$srcdir/$pkgname-$pkgver/build/lib|/usr/include/remill|g"
+        -e "s|$srcdir/$pkgname/build/lib|/usr/include/remill|g"
 }
 
 # vim: set sw=4 ts=4 et: