diff options
-rw-r--r-- | meta/conf/distro/include/tcmode-default.inc | 2 | ||||
-rw-r--r-- | meta/recipes-devtools/llvm/llvm/0007-llvm-allow-env-override-of-exe-path.patch | 18 | ||||
-rw-r--r-- | meta/recipes-devtools/llvm/llvm_git.bb | 4 |
3 files changed, 12 insertions, 12 deletions
diff --git a/meta/conf/distro/include/tcmode-default.inc b/meta/conf/distro/include/tcmode-default.inc index 69280fd210..a7fe1fc0fa 100644 --- a/meta/conf/distro/include/tcmode-default.inc +++ b/meta/conf/distro/include/tcmode-default.inc | |||
@@ -24,7 +24,7 @@ GLIBCVERSION ?= "2.38%" | |||
24 | LINUXLIBCVERSION ?= "6.4%" | 24 | LINUXLIBCVERSION ?= "6.4%" |
25 | QEMUVERSION ?= "8.1%" | 25 | QEMUVERSION ?= "8.1%" |
26 | GOVERSION ?= "1.20%" | 26 | GOVERSION ?= "1.20%" |
27 | LLVMVERSION ?= "16.%" | 27 | LLVMVERSION ?= "17.%" |
28 | RUSTVERSION ?= "1.70%" | 28 | RUSTVERSION ?= "1.70%" |
29 | 29 | ||
30 | PREFERRED_VERSION_gcc ?= "${GCCVERSION}" | 30 | PREFERRED_VERSION_gcc ?= "${GCCVERSION}" |
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 b01b8647c9..add38b3bb4 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,27 +1,26 @@ | |||
1 | Upstream-Status: Pending | 1 | From 588a8694c6540e31140c7e242bfb5e279d6ca08c Mon Sep 17 00:00:00 2001 |
2 | Signed-off-by: Khem Raj <raj.khem@gmail.com> | ||
3 | |||
4 | From 61b00e1e051e367f5483d7b5253b6c85a9e8a90f Mon Sep 17 00:00:00 2001 | ||
5 | From: Martin Kelly <mkelly@xevo.com> | 2 | From: Martin Kelly <mkelly@xevo.com> |
6 | Date: Fri, 19 May 2017 00:22:57 -0700 | 3 | Date: Fri, 19 May 2017 00:22:57 -0700 |
7 | Subject: [PATCH] llvm: allow env override of exe path | 4 | Subject: [PATCH] llvm: allow env override of exe and libdir path |
8 | 5 | ||
9 | 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 |
10 | return the libraries, include directories, etc. from inside the sysroot rather | 7 | return the libraries, include directories, etc. from inside the sysroot rather |
11 | 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 |
12 | llvm-config from a target sysroot. | 9 | llvm-config from a target sysroot. |
13 | 10 | ||
11 | Upstream-Status: Inappropriate [OE-specific] | ||
12 | |||
14 | Signed-off-by: Martin Kelly <mkelly@xevo.com> | 13 | Signed-off-by: Martin Kelly <mkelly@xevo.com> |
15 | Signed-off-by: Khem Raj <raj.khem@gmail.com> | 14 | Signed-off-by: Khem Raj <raj.khem@gmail.com> |
16 | --- | 15 | --- |
17 | llvm/tools/llvm-config/llvm-config.cpp | 7 +++++++ | 16 | llvm/tools/llvm-config/llvm-config.cpp | 25 +++++++++++++++++++------ |
18 | 1 file changed, 7 insertions(+) | 17 | 1 file changed, 19 insertions(+), 6 deletions(-) |
19 | 18 | ||
20 | diff --git a/llvm/tools/llvm-config/llvm-config.cpp b/llvm/tools/llvm-config/llvm-config.cpp | 19 | diff --git a/llvm/tools/llvm-config/llvm-config.cpp b/llvm/tools/llvm-config/llvm-config.cpp |
21 | index 7ef7c46a262..a4f7ed82c7b 100644 | 20 | index e86eb2b44b10..7b2abf318dbe 100644 |
22 | --- a/llvm/tools/llvm-config/llvm-config.cpp | 21 | --- a/llvm/tools/llvm-config/llvm-config.cpp |
23 | +++ b/llvm/tools/llvm-config/llvm-config.cpp | 22 | +++ b/llvm/tools/llvm-config/llvm-config.cpp |
24 | @@ -225,6 +225,13 @@ Typical components:\n\ | 23 | @@ -246,6 +246,13 @@ Typical components:\n\ |
25 | 24 | ||
26 | /// Compute the path to the main executable. | 25 | /// Compute the path to the main executable. |
27 | std::string GetExecutablePath(const char *Argv0) { | 26 | std::string GetExecutablePath(const char *Argv0) { |
@@ -35,3 +34,4 @@ index 7ef7c46a262..a4f7ed82c7b 100644 | |||
35 | // This just needs to be some symbol in the binary; C++ doesn't | 34 | // This just needs to be some symbol in the binary; C++ doesn't |
36 | // allow taking the address of ::main however. | 35 | // allow taking the address of ::main however. |
37 | void *P = (void *)(intptr_t)GetExecutablePath; | 36 | void *P = (void *)(intptr_t)GetExecutablePath; |
37 | |||
diff --git a/meta/recipes-devtools/llvm/llvm_git.bb b/meta/recipes-devtools/llvm/llvm_git.bb index f3d6f24bd2..611aacba14 100644 --- a/meta/recipes-devtools/llvm/llvm_git.bb +++ b/meta/recipes-devtools/llvm/llvm_git.bb | |||
@@ -14,14 +14,14 @@ RDEPENDS:${PN}:append:class-target = " ncurses-terminfo" | |||
14 | 14 | ||
15 | inherit cmake pkgconfig | 15 | inherit cmake pkgconfig |
16 | 16 | ||
17 | PV = "16.0.6" | 17 | PV = "17.0.1" |
18 | 18 | ||
19 | MAJOR_VERSION = "${@oe.utils.trim_version("${PV}", 1)}" | 19 | MAJOR_VERSION = "${@oe.utils.trim_version("${PV}", 1)}" |
20 | 20 | ||
21 | LLVM_RELEASE = "${PV}" | 21 | LLVM_RELEASE = "${PV}" |
22 | 22 | ||
23 | BRANCH = "release/${MAJOR_VERSION}.x" | 23 | BRANCH = "release/${MAJOR_VERSION}.x" |
24 | SRCREV = "7cbf1a2591520c2491aa35339f227775f4d3adf6" | 24 | SRCREV = "e19b7dc36bc047b9eb72078d034596be766da350" |
25 | SRC_URI = "git://github.com/llvm/llvm-project.git;branch=${BRANCH};protocol=https \ | 25 | SRC_URI = "git://github.com/llvm/llvm-project.git;branch=${BRANCH};protocol=https \ |
26 | file://0007-llvm-allow-env-override-of-exe-path.patch;striplevel=2 \ | 26 | file://0007-llvm-allow-env-override-of-exe-path.patch;striplevel=2 \ |
27 | file://0001-AsmMatcherEmitter-sort-ClassInfo-lists-by-name-as-we.patch;striplevel=2 \ | 27 | file://0001-AsmMatcherEmitter-sort-ClassInfo-lists-by-name-as-we.patch;striplevel=2 \ |