Subject: [alpine-aports] [PATCH] community/emscripten-fastcomp: build fix for gcc8

From: alpine-mips-patches <[email-masked]>
Date: Wed, 10 Oct 2018 07:51:48 +0000

The patch is taken from Fedora.
---
 community/emscripten-fastcomp/APKBUILD        |  7 +++--
 ...type-in-ORC-readMem-client-interface.patch | 30 +++++++++++++++++++
 2 files changed, 35 insertions(+), 2 deletions(-)
 create mode 100644 community/emscripten-fastcomp/llvm-fix-return-type-in-ORC-readMem-client-interface.patch

diff --git a/community/emscripten-fastcomp/APKBUILD b/community/emscripten-fastcomp/APKBUILD
index fdc5c25d9e..92f765bbdb 100644
--- a/community/emscripten-fastcomp/APKBUILD
+++ b/community/emscripten-fastcomp/APKBUILD
@@ -18,7 +18,9 @@ makedepends="cmake paxmark zlib-dev"
 source="$pkgname-$pkgver.tar.gz::https://github.com/kripken/$pkgname/archive/$pkgver.tar.gz
 	$pkgname-clang-$pkgver.tar.gz::https://github.com/kripken/$pkgname-clang/archive/$pkgver.tar.gz
 	llvm-fix-build-with-musl-libc.patch
-	llvm-fix-DynamicLibrary-to-build-with-musl-libc.patch"
+	llvm-fix-DynamicLibrary-to-build-with-musl-libc.patch
+	llvm-fix-return-type-in-ORC-readMem-client-interface.patch
+	"
 builddir="$srcdir/$pkgname-$pkgver"
 options="!check"  # some tests are broken, don't bother with it for now
 
@@ -81,4 +83,5 @@ package() {
 sha512sums="8a7ab29f2b239eef43bfcea3359847d9566aecd1252f6f27685e43bb71ef9031d3dffc14f07fdf97979461ea4e07140510aebec315ab4fdfaec9fcb944370c6a  emscripten-fastcomp-1.37.10.tar.gz
 54442b598001204420087b7ff6168c34a626e39a3992a343294cdc9c9a93020ca8de19365d15afc97d35ff94f584f50663e0b843696596f3ad3441608d974270  emscripten-fastcomp-clang-1.37.10.tar.gz
 f84cd65d7042e89826ba6e8d48c4c302bf4980da369d7f19a55f217e51c00ca8ed178d453df3a3cee76598a7cecb94aed0775a6d24fe73266f82749913fc3e71  llvm-fix-build-with-musl-libc.patch
-19bfb9282455d39d07dbb2b1293b03a45c57d522fbb9c5e58dac034200669628b97e7a90cd4ff5d52d9bb79acfccbef653d8a1140a7f0589ecd6f9b7c4ba0eb6  llvm-fix-DynamicLibrary-to-build-with-musl-libc.patch"
+19bfb9282455d39d07dbb2b1293b03a45c57d522fbb9c5e58dac034200669628b97e7a90cd4ff5d52d9bb79acfccbef653d8a1140a7f0589ecd6f9b7c4ba0eb6  llvm-fix-DynamicLibrary-to-build-with-musl-libc.patch
+f57c734687c8ceae8d1bbfcbfdeecb75a5059a112967f4ba639d78d2484e0cc1deabf02ba2d3a6f5283443bf8b3230f38ad143800f8f3327cca0d2691a3ddc3d  llvm-fix-return-type-in-ORC-readMem-client-interface.patch"
diff --git a/community/emscripten-fastcomp/llvm-fix-return-type-in-ORC-readMem-client-interface.patch b/community/emscripten-fastcomp/llvm-fix-return-type-in-ORC-readMem-client-interface.patch
new file mode 100644
index 0000000000..5296fdb0ba
--- /dev/null
+++ b/community/emscripten-fastcomp/llvm-fix-return-type-in-ORC-readMem-client-interface.patch
@@ -0,0 +1,30 @@
+From 5cea35478aaaac7728a50cbafd3770f96162f7ac Mon Sep 17 00:00:00 2001
+From: Tilmann Scheller <[email-masked]>
+Date: Thu, 1 Feb 2018 11:40:01 -0600
+Subject: [PATCH] Fix return type in ORC readMem() client interface.
+
+GCC 8.0.1 detects the type mismatch and causes the compilation to fail. Clang
+and earlier versions of GCC don't detect the issue.
+
+Fixes rhbz#1540620.
+---
+ include/llvm/ExecutionEngine/Orc/OrcRemoteTargetClient.h | 4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/include/llvm/ExecutionEngine/Orc/OrcRemoteTargetClient.h b/include/llvm/ExecutionEngine/Orc/OrcRemoteTargetClient.h
+index da02250ba16..bed472e2e0e 100644
+--- a/include/llvm/ExecutionEngine/Orc/OrcRemoteTargetClient.h
++++ b/include/llvm/ExecutionEngine/Orc/OrcRemoteTargetClient.h
+@@ -713,8 +713,8 @@ private:
+ 
+   uint32_t getTrampolineSize() const { return RemoteTrampolineSize; }
+ 
+-  Expected<std::vector<char>> readMem(char *Dst, JITTargetAddress Src,
+-                                      uint64_t Size) {
++  Expected<std::vector<uint8_t>> readMem(char *Dst, JITTargetAddress Src,
++                                         uint64_t Size) {
+     // Check for an 'out-of-band' error, e.g. from an MM destructor.
+     if (ExistingError)
+       return std::move(ExistingError);
+-- 
+2.16.1
-- 
2.19.1

---
Unsubscribe:  [email-masked]
Help:         [email-masked]
---