summaryrefslogtreecommitdiffstats
path: root/meta/recipes-graphics/mesa/files
diff options
context:
space:
mode:
Diffstat (limited to 'meta/recipes-graphics/mesa/files')
-rw-r--r--meta/recipes-graphics/mesa/files/0001-ac-fix-build-after-LLVM-5.0-SVN-r300718.patch40
-rw-r--r--meta/recipes-graphics/mesa/files/0002-gallivm-Fix-build-against-LLVM-SVN-r302589.patch49
2 files changed, 0 insertions, 89 deletions
diff --git a/meta/recipes-graphics/mesa/files/0001-ac-fix-build-after-LLVM-5.0-SVN-r300718.patch b/meta/recipes-graphics/mesa/files/0001-ac-fix-build-after-LLVM-5.0-SVN-r300718.patch
deleted file mode 100644
index b27a3bc8e4..0000000000
--- a/meta/recipes-graphics/mesa/files/0001-ac-fix-build-after-LLVM-5.0-SVN-r300718.patch
+++ /dev/null
@@ -1,40 +0,0 @@
1From 9861437e58fdd0de01193a102608d34e5952953f Mon Sep 17 00:00:00 2001
2From: Christoph Haag <haagch+mesadev@frickel.club>
3Date: Thu, 20 Apr 2017 10:34:18 +0200
4Subject: [PATCH 1/2] ac: fix build after LLVM 5.0 SVN r300718
5MIME-Version: 1.0
6Content-Type: text/plain; charset=UTF-8
7Content-Transfer-Encoding: 8bit
8
9v2: previously getWithDereferenceableBytes() exists, but addAttr() doesn't take that type
10
11Signed-off-by: Christoph Haag <haagch+mesadev@frickel.club>
12Reviewed-by: Nicolai Hähnle <nicolai.haehnle@amd.com>
13Tested-and-reviewed-by: Mike Lothian <mike@fireburn.co.uk>
14---
15Upstream-Status: Backport
16
17 src/amd/common/ac_llvm_helper.cpp | 4 ++++
18 1 file changed, 4 insertions(+)
19
20diff --git a/src/amd/common/ac_llvm_helper.cpp b/src/amd/common/ac_llvm_helper.cpp
21index d9ea4b1..11fa809 100644
22--- a/src/amd/common/ac_llvm_helper.cpp
23+++ b/src/amd/common/ac_llvm_helper.cpp
24@@ -44,9 +44,13 @@ typedef AttributeSet AttributeList;
25 void ac_add_attr_dereferenceable(LLVMValueRef val, uint64_t bytes)
26 {
27 llvm::Argument *A = llvm::unwrap<llvm::Argument>(val);
28+#if HAVE_LLVM < 0x0500
29 llvm::AttrBuilder B;
30 B.addDereferenceableAttr(bytes);
31 A->addAttr(llvm::AttributeList::get(A->getContext(), A->getArgNo() + 1, B));
32+#else
33+ A->addAttr(llvm::Attribute::getWithDereferenceableBytes(A->getContext(), bytes));
34+#endif
35 }
36
37 bool ac_is_sgpr_param(LLVMValueRef arg)
38--
392.13.3
40
diff --git a/meta/recipes-graphics/mesa/files/0002-gallivm-Fix-build-against-LLVM-SVN-r302589.patch b/meta/recipes-graphics/mesa/files/0002-gallivm-Fix-build-against-LLVM-SVN-r302589.patch
deleted file mode 100644
index ac8caec74d..0000000000
--- a/meta/recipes-graphics/mesa/files/0002-gallivm-Fix-build-against-LLVM-SVN-r302589.patch
+++ /dev/null
@@ -1,49 +0,0 @@
1From a02a0dfda2712d30ad62b8f0421ec7b8244ba2cb Mon Sep 17 00:00:00 2001
2From: =?UTF-8?q?Michel=20D=C3=A4nzer?= <michel.daenzer@amd.com>
3Date: Wed, 10 May 2017 17:26:07 +0900
4Subject: [PATCH 2/2] gallivm: Fix build against LLVM SVN >= r302589
5MIME-Version: 1.0
6Content-Type: text/plain; charset=UTF-8
7Content-Transfer-Encoding: 8bit
8
9deregisterEHFrames doesn't take any parameters anymore.
10
11Reviewed-by: Vedran Miletić <vedran@miletic.net>
12Reviewed-by: Marek Olšák <marek.olsak@amd.com>
13---
14Upstream-Status: Backport
15
16 src/gallium/auxiliary/gallivm/lp_bld_misc.cpp | 12 +++++++++---
17 1 file changed, 9 insertions(+), 3 deletions(-)
18
19diff --git a/src/gallium/auxiliary/gallivm/lp_bld_misc.cpp b/src/gallium/auxiliary/gallivm/lp_bld_misc.cpp
20index 2a388cb..0e4a531 100644
21--- a/src/gallium/auxiliary/gallivm/lp_bld_misc.cpp
22+++ b/src/gallium/auxiliary/gallivm/lp_bld_misc.cpp
23@@ -342,14 +342,20 @@ class DelegatingJITMemoryManager : public BaseMemoryManager {
24 virtual void registerEHFrames(uint8_t *Addr, uint64_t LoadAddr, size_t Size) {
25 mgr()->registerEHFrames(Addr, LoadAddr, Size);
26 }
27- virtual void deregisterEHFrames(uint8_t *Addr, uint64_t LoadAddr, size_t Size) {
28- mgr()->deregisterEHFrames(Addr, LoadAddr, Size);
29- }
30 #else
31 virtual void registerEHFrames(llvm::StringRef SectionData) {
32 mgr()->registerEHFrames(SectionData);
33 }
34 #endif
35+#if HAVE_LLVM >= 0x0500
36+ virtual void deregisterEHFrames() {
37+ mgr()->deregisterEHFrames();
38+ }
39+#elif HAVE_LLVM >= 0x0304
40+ virtual void deregisterEHFrames(uint8_t *Addr, uint64_t LoadAddr, size_t Size) {
41+ mgr()->deregisterEHFrames(Addr, LoadAddr, Size);
42+ }
43+#endif
44 virtual void *getPointerToNamedFunction(const std::string &Name,
45 bool AbortOnFailure=true) {
46 return mgr()->getPointerToNamedFunction(Name, AbortOnFailure);
47--
482.13.3
49