Discussion:
[meta-arago] [master][PATCH] ti-llvm3.6: fix for gcc8
Denys Dmytriyenko
2018-10-16 20:39:23 UTC
Permalink
Signed-off-by: Denys Dmytriyenko <***@ti.com>
---
...ueMap.h-unique_ptr-conversion-to-bool-ope.patch | 29 ++++++++++++++++++++++
.../recipes-core/llvm/ti-llvm3.6_3.6.bb | 1 +
2 files changed, 30 insertions(+)
create mode 100644 meta-arago-extras/recipes-core/llvm/ti-llvm3.6/0001-llvm-IR-ValueMap.h-unique_ptr-conversion-to-bool-ope.patch

diff --git a/meta-arago-extras/recipes-core/llvm/ti-llvm3.6/0001-llvm-IR-ValueMap.h-unique_ptr-conversion-to-bool-ope.patch b/meta-arago-extras/recipes-core/llvm/ti-llvm3.6/0001-llvm-IR-ValueMap.h-unique_ptr-conversion-to-bool-ope.patch
new file mode 100644
index 0000000..b5d3d46
--- /dev/null
+++ b/meta-arago-extras/recipes-core/llvm/ti-llvm3.6/0001-llvm-IR-ValueMap.h-unique_ptr-conversion-to-bool-ope.patch
@@ -0,0 +1,29 @@
+From b5e503109f95f25828d0398be66474502239489d Mon Sep 17 00:00:00 2001
+From: Denys Dmytriyenko <***@ti.com>
+Date: Tue, 16 Oct 2018 16:13:52 -0400
+Subject: [PATCH] llvm/IR/ValueMap.h: unique_ptr conversion to bool operator is
+ declared explicit
+
+Fixes build with gcc8.
+
+Signed-off-by: Denys Dmytriyenko <***@ti.com>
+---
+ include/llvm/IR/ValueMap.h | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/include/llvm/IR/ValueMap.h b/include/llvm/IR/ValueMap.h
+index f2ea405..f9a1a62 100644
+--- a/include/llvm/IR/ValueMap.h
++++ b/include/llvm/IR/ValueMap.h
+@@ -101,7 +101,7 @@ public:
+
+ ~ValueMap() {}
+
+- bool hasMD() const { return MDMap; }
++ bool hasMD() const { return static_cast<bool>(MDMap); }
+ MDMapT &MD() {
+ if (!MDMap)
+ MDMap.reset(new MDMapT);
+--
+2.7.4
+
diff --git a/meta-arago-extras/recipes-core/llvm/ti-llvm3.6_3.6.bb b/meta-arago-extras/recipes-core/llvm/ti-llvm3.6_3.6.bb
index 91d3cea..7d1e317 100644
--- a/meta-arago-extras/recipes-core/llvm/ti-llvm3.6_3.6.bb
+++ b/meta-arago-extras/recipes-core/llvm/ti-llvm3.6_3.6.bb
@@ -40,6 +40,7 @@ SRC_URI = " \
${LLVM_GIT_URI};protocol=${LLVM_GIT_PROTOCOL};branch=${LLVM_GIT_BRANCH};destsuffix=${LLVM_GIT_DESTSUFFIX};name=${LLVM_GIT_NAME} \
${CLANG_GIT_URI};protocol=${CLANG_GIT_PROTOCOL};branch=${CLANG_GIT_BRANCH};destsuffix=${CLANG_GIT_DESTSUFFIX};name=${CLANG_GIT_NAME} \
file://0001-configure-Do-not-check-build-executable-extension.patch \
+ file://0001-llvm-IR-ValueMap.h-unique_ptr-conversion-to-bool-ope.patch \
"

SRCREV_${LLVM_GIT_NAME} = "${LLVM_GIT_SRCREV}"
--
2.7.4
Loading...