diff options
Diffstat (limited to 'meta/recipes-devtools/llvm')
3 files changed, 16 insertions, 24 deletions
diff --git a/meta/recipes-devtools/llvm/llvm/0006-llvm-TargetLibraryInfo-Undefine-libc-functions-if-th.patch b/meta/recipes-devtools/llvm/llvm/0006-llvm-TargetLibraryInfo-Undefine-libc-functions-if-th.patch index 789c308863..d75c94e9e9 100644 --- a/meta/recipes-devtools/llvm/llvm/0006-llvm-TargetLibraryInfo-Undefine-libc-functions-if-th.patch +++ b/meta/recipes-devtools/llvm/llvm/0006-llvm-TargetLibraryInfo-Undefine-libc-functions-if-th.patch | |||
@@ -1,13 +1,11 @@ | |||
1 | From 4c08879d2dfbe7face4e679ac8499dc7bff2dd20 Mon Sep 17 00:00:00 2001 | 1 | From dbeecdb307be8b783b42cbc89dcb9c5e7f528989 Mon Sep 17 00:00:00 2001 |
2 | From: Khem Raj <raj.khem@gmail.com> | 2 | From: Khem Raj <raj.khem@gmail.com> |
3 | Date: Sat, 21 May 2016 00:33:20 +0000 | 3 | Date: Sat, 21 May 2016 00:33:20 +0000 |
4 | Subject: [PATCH 06/19] llvm: TargetLibraryInfo: Undefine libc functions if | 4 | Subject: [PATCH] llvm: TargetLibraryInfo: Undefine libc functions if they are macros |
5 | they are macros | ||
6 | 5 | ||
7 | musl defines some functions as macros and not inline functions | 6 | musl defines some functions as macros and not inline functions |
8 | if this is the case then make sure to undefine them | 7 | if this is the case then make sure to undefine them |
9 | 8 | ||
10 | Upstream-Status: Pending | ||
11 | Signed-off-by: Khem Raj <raj.khem@gmail.com> | 9 | Signed-off-by: Khem Raj <raj.khem@gmail.com> |
12 | --- | 10 | --- |
13 | .../llvm/Analysis/TargetLibraryInfo.def | 21 +++++++++++++++++++ | 11 | .../llvm/Analysis/TargetLibraryInfo.def | 21 +++++++++++++++++++ |
@@ -87,6 +85,3 @@ index afed404f04c..876888656f2 100644 | |||
87 | TLI_DEFINE_ENUM_INTERNAL(tmpfile64) | 85 | TLI_DEFINE_ENUM_INTERNAL(tmpfile64) |
88 | TLI_DEFINE_STRING_INTERNAL("tmpfile64") | 86 | TLI_DEFINE_STRING_INTERNAL("tmpfile64") |
89 | /// int toascii(int c); | 87 | /// int toascii(int c); |
90 | -- | ||
91 | 2.22.0 | ||
92 | |||
diff --git a/meta/recipes-devtools/llvm/llvm/0007-llvm-allow-env-override-of-exe-path.patch b/meta/recipes-devtools/llvm/llvm/0007-llvm-allow-env-override-of-exe-path.patch index f47080c9fd..58dce513c2 100644 --- a/meta/recipes-devtools/llvm/llvm/0007-llvm-allow-env-override-of-exe-path.patch +++ b/meta/recipes-devtools/llvm/llvm/0007-llvm-allow-env-override-of-exe-path.patch | |||
@@ -1,14 +1,13 @@ | |||
1 | From b66d6f39a374b8df41e7235351e5dee2e81f440c Mon Sep 17 00:00:00 2001 | 1 | From 61b00e1e051e367f5483d7b5253b6c85a9e8a90f Mon Sep 17 00:00:00 2001 |
2 | From: Martin Kelly <mkelly@xevo.com> | 2 | From: Martin Kelly <mkelly@xevo.com> |
3 | Date: Fri, 19 May 2017 00:22:57 -0700 | 3 | Date: Fri, 19 May 2017 00:22:57 -0700 |
4 | Subject: [PATCH 07/19] llvm: allow env override of exe path | 4 | Subject: [PATCH] llvm: allow env override of exe path |
5 | 5 | ||
6 | When using a native llvm-config from inside a sysroot, we need llvm-config to | 6 | When using a native llvm-config from inside a sysroot, we need llvm-config to |
7 | return the libraries, include directories, etc. from inside the sysroot rather | 7 | return the libraries, include directories, etc. from inside the sysroot rather |
8 | than from the native sysroot. Thus provide an env override for calling | 8 | than from the native sysroot. Thus provide an env override for calling |
9 | llvm-config from a target sysroot. | 9 | llvm-config from a target sysroot. |
10 | 10 | ||
11 | Upstream-Status: Pending | ||
12 | Signed-off-by: Martin Kelly <mkelly@xevo.com> | 11 | Signed-off-by: Martin Kelly <mkelly@xevo.com> |
13 | Signed-off-by: Khem Raj <raj.khem@gmail.com> | 12 | Signed-off-by: Khem Raj <raj.khem@gmail.com> |
14 | --- | 13 | --- |
@@ -33,6 +32,3 @@ index 7ef7c46a262..a4f7ed82c7b 100644 | |||
33 | // This just needs to be some symbol in the binary; C++ doesn't | 32 | // This just needs to be some symbol in the binary; C++ doesn't |
34 | // allow taking the address of ::main however. | 33 | // allow taking the address of ::main however. |
35 | void *P = (void *)(intptr_t)GetExecutablePath; | 34 | void *P = (void *)(intptr_t)GetExecutablePath; |
36 | -- | ||
37 | 2.22.0 | ||
38 | |||
diff --git a/meta/recipes-devtools/llvm/llvm_git.bb b/meta/recipes-devtools/llvm/llvm_git.bb index 9b113f692f..5f9277fc0f 100644 --- a/meta/recipes-devtools/llvm/llvm_git.bb +++ b/meta/recipes-devtools/llvm/llvm_git.bb | |||
@@ -3,10 +3,10 @@ | |||
3 | 3 | ||
4 | DESCRIPTION = "The LLVM Compiler Infrastructure" | 4 | DESCRIPTION = "The LLVM Compiler Infrastructure" |
5 | HOMEPAGE = "http://llvm.org" | 5 | HOMEPAGE = "http://llvm.org" |
6 | LICENSE = "NCSA" | 6 | LICENSE = "Apache-2.0-with-LLVM-exception" |
7 | SECTION = "devel" | 7 | SECTION = "devel" |
8 | 8 | ||
9 | LIC_FILES_CHKSUM = "file://LICENSE.TXT;md5=c6b766a4e85dd28301eeed54a6684648" | 9 | LIC_FILES_CHKSUM = "file://LICENSE.TXT;md5=8a15a0759ef07f2682d2ba4b893c9afe" |
10 | 10 | ||
11 | DEPENDS = "libffi libxml2 zlib libedit ninja-native llvm-native" | 11 | DEPENDS = "libffi libxml2 zlib libedit ninja-native llvm-native" |
12 | 12 | ||
@@ -16,17 +16,17 @@ inherit cmake pkgconfig | |||
16 | 16 | ||
17 | PROVIDES += "llvm${PV}" | 17 | PROVIDES += "llvm${PV}" |
18 | 18 | ||
19 | MAJOR_VERSION = "9" | ||
20 | MINOR_VERSION = "0" | ||
21 | PATCH_VERSION = "0" | ||
22 | |||
23 | PV = "${MAJOR_VERSION}.${MINOR_VERSION}.${PATCH_VERSION}" | ||
24 | |||
19 | LLVM_RELEASE = "${PV}" | 25 | LLVM_RELEASE = "${PV}" |
20 | LLVM_DIR = "llvm${LLVM_RELEASE}" | 26 | LLVM_DIR = "llvm${LLVM_RELEASE}" |
21 | 27 | ||
22 | SRCREV = "19a71f6bdf2dddb10764939e7f0ec2b98dba76c9" | ||
23 | |||
24 | BRANCH = "release/${MAJOR_VERSION}.x" | 28 | BRANCH = "release/${MAJOR_VERSION}.x" |
25 | MAJOR_VERSION = "8" | 29 | SRCREV = "0399d5a9682b3cef71c653373e38890c63c4c365" |
26 | MINOR_VERSION = "0" | ||
27 | PATCH_VERSION = "1" | ||
28 | SOLIBVER = "1" | ||
29 | PV = "${MAJOR_VERSION}.${MINOR_VERSION}.${PATCH_VERSION}" | ||
30 | SRC_URI = "git://github.com/llvm/llvm-project.git;branch=${BRANCH} \ | 30 | SRC_URI = "git://github.com/llvm/llvm-project.git;branch=${BRANCH} \ |
31 | file://0006-llvm-TargetLibraryInfo-Undefine-libc-functions-if-th.patch;striplevel=2 \ | 31 | file://0006-llvm-TargetLibraryInfo-Undefine-libc-functions-if-th.patch;striplevel=2 \ |
32 | file://0007-llvm-allow-env-override-of-exe-path.patch;striplevel=2 \ | 32 | file://0007-llvm-allow-env-override-of-exe-path.patch;striplevel=2 \ |
@@ -45,6 +45,7 @@ def get_llvm_arch(bb, d, arch_var): | |||
45 | elif re.match(r'aarch64$', a): return 'AArch64' | 45 | elif re.match(r'aarch64$', a): return 'AArch64' |
46 | elif re.match(r'aarch64_be$', a): return 'AArch64' | 46 | elif re.match(r'aarch64_be$', a): return 'AArch64' |
47 | elif re.match(r'mips(isa|)(32|64|)(r6|)(el|)$', a): return 'Mips' | 47 | elif re.match(r'mips(isa|)(32|64|)(r6|)(el|)$', a): return 'Mips' |
48 | elif re.match(r'riscv(32|64)(eb|)$', a): return 'RISCV' | ||
48 | elif re.match(r'p(pc|owerpc)(|64)', a): return 'PowerPC' | 49 | elif re.match(r'p(pc|owerpc)(|64)', a): return 'PowerPC' |
49 | else: | 50 | else: |
50 | raise bb.parse.SkipRecipe("Cannot map '%s' to a supported LLVM architecture" % a) | 51 | raise bb.parse.SkipRecipe("Cannot map '%s' to a supported LLVM architecture" % a) |
@@ -156,7 +157,7 @@ FILES_${PN}-liblto += "\ | |||
156 | " | 157 | " |
157 | 158 | ||
158 | FILES_${PN}-liboptremarks += "\ | 159 | FILES_${PN}-liboptremarks += "\ |
159 | ${libdir}/${LLVM_DIR}/libOptRemarks.so.* \ | 160 | ${libdir}/${LLVM_DIR}/libRemarks.so.* \ |
160 | " | 161 | " |
161 | 162 | ||
162 | FILES_${PN}-llvmhello = "\ | 163 | FILES_${PN}-llvmhello = "\ |
@@ -165,7 +166,7 @@ FILES_${PN}-llvmhello = "\ | |||
165 | 166 | ||
166 | FILES_${PN}-dev += " \ | 167 | FILES_${PN}-dev += " \ |
167 | ${libdir}/${LLVM_DIR}/llvm-config \ | 168 | ${libdir}/${LLVM_DIR}/llvm-config \ |
168 | ${libdir}/${LLVM_DIR}/libOptRemarks.so \ | 169 | ${libdir}/${LLVM_DIR}/libRemarks.so \ |
169 | ${libdir}/${LLVM_DIR}/libLLVM-${MAJOR_VERSION}.${MINOR_VERSION}.${PATCH_VERSION}.so \ | 170 | ${libdir}/${LLVM_DIR}/libLLVM-${MAJOR_VERSION}.${MINOR_VERSION}.${PATCH_VERSION}.so \ |
170 | " | 171 | " |
171 | 172 | ||