diff options
Diffstat (limited to 'meta/recipes-graphics/mesa/files')
3 files changed, 121 insertions, 0 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 new file mode 100644 index 0000000000..b27a3bc8e4 --- /dev/null +++ b/meta/recipes-graphics/mesa/files/0001-ac-fix-build-after-LLVM-5.0-SVN-r300718.patch | |||
@@ -0,0 +1,40 @@ | |||
1 | From 9861437e58fdd0de01193a102608d34e5952953f Mon Sep 17 00:00:00 2001 | ||
2 | From: Christoph Haag <haagch+mesadev@frickel.club> | ||
3 | Date: Thu, 20 Apr 2017 10:34:18 +0200 | ||
4 | Subject: [PATCH 1/2] ac: fix build after LLVM 5.0 SVN r300718 | ||
5 | MIME-Version: 1.0 | ||
6 | Content-Type: text/plain; charset=UTF-8 | ||
7 | Content-Transfer-Encoding: 8bit | ||
8 | |||
9 | v2: previously getWithDereferenceableBytes() exists, but addAttr() doesn't take that type | ||
10 | |||
11 | Signed-off-by: Christoph Haag <haagch+mesadev@frickel.club> | ||
12 | Reviewed-by: Nicolai Hähnle <nicolai.haehnle@amd.com> | ||
13 | Tested-and-reviewed-by: Mike Lothian <mike@fireburn.co.uk> | ||
14 | --- | ||
15 | Upstream-Status: Backport | ||
16 | |||
17 | src/amd/common/ac_llvm_helper.cpp | 4 ++++ | ||
18 | 1 file changed, 4 insertions(+) | ||
19 | |||
20 | diff --git a/src/amd/common/ac_llvm_helper.cpp b/src/amd/common/ac_llvm_helper.cpp | ||
21 | index 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 | -- | ||
39 | 2.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 new file mode 100644 index 0000000000..ac8caec74d --- /dev/null +++ b/meta/recipes-graphics/mesa/files/0002-gallivm-Fix-build-against-LLVM-SVN-r302589.patch | |||
@@ -0,0 +1,49 @@ | |||
1 | From a02a0dfda2712d30ad62b8f0421ec7b8244ba2cb Mon Sep 17 00:00:00 2001 | ||
2 | From: =?UTF-8?q?Michel=20D=C3=A4nzer?= <michel.daenzer@amd.com> | ||
3 | Date: Wed, 10 May 2017 17:26:07 +0900 | ||
4 | Subject: [PATCH 2/2] gallivm: Fix build against LLVM SVN >= r302589 | ||
5 | MIME-Version: 1.0 | ||
6 | Content-Type: text/plain; charset=UTF-8 | ||
7 | Content-Transfer-Encoding: 8bit | ||
8 | |||
9 | deregisterEHFrames doesn't take any parameters anymore. | ||
10 | |||
11 | Reviewed-by: Vedran Miletić <vedran@miletic.net> | ||
12 | Reviewed-by: Marek Olšák <marek.olsak@amd.com> | ||
13 | --- | ||
14 | Upstream-Status: Backport | ||
15 | |||
16 | src/gallium/auxiliary/gallivm/lp_bld_misc.cpp | 12 +++++++++--- | ||
17 | 1 file changed, 9 insertions(+), 3 deletions(-) | ||
18 | |||
19 | diff --git a/src/gallium/auxiliary/gallivm/lp_bld_misc.cpp b/src/gallium/auxiliary/gallivm/lp_bld_misc.cpp | ||
20 | index 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 | -- | ||
48 | 2.13.3 | ||
49 | |||
diff --git a/meta/recipes-graphics/mesa/files/llvm-config-version.patch b/meta/recipes-graphics/mesa/files/llvm-config-version.patch new file mode 100644 index 0000000000..aa33a1e915 --- /dev/null +++ b/meta/recipes-graphics/mesa/files/llvm-config-version.patch | |||
@@ -0,0 +1,32 @@ | |||
1 | When building llvm from git or svn it embeds the svn/git revision into internal version string | ||
2 | |||
3 | $ /mnt/a/oe/build/tmp/work/corei7-64-bec-linux/mesa/2_17.1.5-r0/recipe-sysroot/usr/lib/llvm5.0/llvm-config-host --version | ||
4 | 5.0.0git-9a5c333388c | ||
5 | |||
6 | We need to ignore everything after 5.0.0 which is what the cut cmd is doing | ||
7 | |||
8 | Upstream-Status: Pending | ||
9 | Signed-off-by: Khem Raj <raj.khem@gmail.com> | ||
10 | |||
11 | Index: mesa-17.1.5/configure.ac | ||
12 | =================================================================== | ||
13 | --- mesa-17.1.5.orig/configure.ac | ||
14 | +++ mesa-17.1.5/configure.ac | ||
15 | @@ -967,7 +967,7 @@ strip_unwanted_llvm_flags() { | ||
16 | |||
17 | llvm_set_environment_variables() { | ||
18 | if test "x$LLVM_CONFIG" != xno; then | ||
19 | - LLVM_VERSION=`$LLVM_CONFIG --version | egrep -o '^[[0-9.]]+'` | ||
20 | + LLVM_VERSION=`$LLVM_CONFIG --version | cut -c1-5` | ||
21 | LLVM_CPPFLAGS=`strip_unwanted_llvm_flags "$LLVM_CONFIG --cppflags"` | ||
22 | LLVM_INCLUDEDIR=`$LLVM_CONFIG --includedir` | ||
23 | LLVM_LIBDIR=`$LLVM_CONFIG --libdir` | ||
24 | @@ -2560,7 +2560,7 @@ if test "x$enable_llvm" = xyes; then | ||
25 | dnl (See https://llvm.org/bugs/show_bug.cgi?id=6823) | ||
26 | if test "x$enable_llvm_shared_libs" = xyes; then | ||
27 | dnl We can't use $LLVM_VERSION because it has 'svn' stripped out, | ||
28 | - LLVM_SO_NAME=LLVM-`$LLVM_CONFIG --version` | ||
29 | + LLVM_SO_NAME=LLVM-`$LLVM_CONFIG --version|cut -c1-5` | ||
30 | AS_IF([test -f "$LLVM_LIBDIR/lib$LLVM_SO_NAME.$IMP_LIB_EXT"], [llvm_have_one_so=yes]) | ||
31 | |||
32 | if test "x$llvm_have_one_so" = xyes; then | ||