diff options
author | Khem Raj <raj.khem@gmail.com> | 2015-08-05 15:06:58 -0700 |
---|---|---|
committer | Khem Raj <raj.khem@gmail.com> | 2015-08-05 15:06:58 -0700 |
commit | e3cfb373083571aaaaa5a3fc845f3233e629890c (patch) | |
tree | db83f500b63855440261ee6e206e81cec853e04c | |
parent | 3468eae4fc7d899c9d7265d4f843940b63503cf9 (diff) | |
download | meta-clang-e3cfb373083571aaaaa5a3fc845f3233e629890c.tar.gz |
clang: Update to latest on release_37 branch
Drop the upstreamed patches
Signed-off-by: Khem Raj <raj.khem@gmail.com>
-rw-r--r-- | recipes-devtools/clang/clang/0001-Choose-right-dynamic-linker-when-hard-float-ABI-is-e.patch | 40 | ||||
-rw-r--r-- | recipes-devtools/clang/clang_git.bb | 5 |
2 files changed, 2 insertions, 43 deletions
diff --git a/recipes-devtools/clang/clang/0001-Choose-right-dynamic-linker-when-hard-float-ABI-is-e.patch b/recipes-devtools/clang/clang/0001-Choose-right-dynamic-linker-when-hard-float-ABI-is-e.patch deleted file mode 100644 index e0cc977..0000000 --- a/recipes-devtools/clang/clang/0001-Choose-right-dynamic-linker-when-hard-float-ABI-is-e.patch +++ /dev/null | |||
@@ -1,40 +0,0 @@ | |||
1 | From c02522a155fdc03f293d58d444c4f030f62d04d6 Mon Sep 17 00:00:00 2001 | ||
2 | From: Khem Raj <raj.khem@gmail.com> | ||
3 | Date: Wed, 8 Jul 2015 23:25:36 -0700 | ||
4 | Subject: [PATCH] Choose right dynamic linker when hard float ABI is expressed | ||
5 | on commandline | ||
6 | |||
7 | Currently trigger to select hard-float linker is only based of -gnueahf | ||
8 | appearing in target triplet, but we should also select it when hardfloat | ||
9 | is requested via cmdline | ||
10 | |||
11 | Signed-off-by: Khem Raj <raj.khem@gmail.com> | ||
12 | --- | ||
13 | lib/Driver/Tools.cpp | 6 ++++-- | ||
14 | 1 file changed, 4 insertions(+), 2 deletions(-) | ||
15 | |||
16 | diff --git a/tools/clang/lib/Driver/Tools.cpp b/tools/clang/lib/Driver/Tools.cpp | ||
17 | index 38c3d5c..cd3a097 100644 | ||
18 | --- a/tools/clang/lib/Driver/Tools.cpp | ||
19 | +++ b/tools/clang/lib/Driver/Tools.cpp | ||
20 | @@ -7834,13 +7834,15 @@ static std::string getLinuxDynamicLinker(const ArgList &Args, | ||
21 | else if (Arch == llvm::Triple::aarch64_be) | ||
22 | return "/lib/ld-linux-aarch64_be.so.1"; | ||
23 | else if (Arch == llvm::Triple::arm || Arch == llvm::Triple::thumb) { | ||
24 | - if (ToolChain.getTriple().getEnvironment() == llvm::Triple::GNUEABIHF) | ||
25 | + if (ToolChain.getTriple().getEnvironment() == llvm::Triple::GNUEABIHF || | ||
26 | + tools::arm::getARMFloatABI(ToolChain.getDriver(), Args, ToolChain.getTriple()) == "hard") | ||
27 | return "/lib/ld-linux-armhf.so.3"; | ||
28 | else | ||
29 | return "/lib/ld-linux.so.3"; | ||
30 | } else if (Arch == llvm::Triple::armeb || Arch == llvm::Triple::thumbeb) { | ||
31 | // TODO: check which dynamic linker name. | ||
32 | - if (ToolChain.getTriple().getEnvironment() == llvm::Triple::GNUEABIHF) | ||
33 | + if (ToolChain.getTriple().getEnvironment() == llvm::Triple::GNUEABIHF || | ||
34 | + tools::arm::getARMFloatABI(ToolChain.getDriver(), Args, ToolChain.getTriple()) == "hard") | ||
35 | return "/lib/ld-linux-armhf.so.3"; | ||
36 | else | ||
37 | return "/lib/ld-linux.so.3"; | ||
38 | -- | ||
39 | 2.1.4 | ||
40 | |||
diff --git a/recipes-devtools/clang/clang_git.bb b/recipes-devtools/clang/clang_git.bb index 0dd268e..7986cf6 100644 --- a/recipes-devtools/clang/clang_git.bb +++ b/recipes-devtools/clang/clang_git.bb | |||
@@ -15,11 +15,10 @@ LIC_FILES_CHKSUM = "file://LICENSE.TXT;md5=4c0bc17c954e99fd547528d938832bfa; \ | |||
15 | SRC_URI = "git://github.com/llvm-mirror/llvm.git;branch=${BRANCH};name=llvm \ | 15 | SRC_URI = "git://github.com/llvm-mirror/llvm.git;branch=${BRANCH};name=llvm \ |
16 | git://github.com/llvm-mirror/clang.git;branch=${BRANCH};destsuffix=git/tools/clang;name=clang \ | 16 | git://github.com/llvm-mirror/clang.git;branch=${BRANCH};destsuffix=git/tools/clang;name=clang \ |
17 | file://0001-Remove-CMAKE_CROSSCOMPILING-so-it-can-cross-compile.patch \ | 17 | file://0001-Remove-CMAKE_CROSSCOMPILING-so-it-can-cross-compile.patch \ |
18 | file://0001-Choose-right-dynamic-linker-when-hard-float-ABI-is-e.patch \ | ||
19 | " | 18 | " |
20 | 19 | ||
21 | SRCREV_llvm = "9dd0401722fd60349c00d0714666f0db3f7a4067" | 20 | SRCREV_llvm = "937d48bea8f01b02d5f3db05a9e58dfb976e9d3b" |
22 | SRCREV_clang = "219ecbfdcb845d9657e202500bb75beae99a7688" | 21 | SRCREV_clang = "0c0116f5826045008e6627967abe0e9320700e2b" |
23 | 22 | ||
24 | SRCREV_FORMAT = "llvm_clang" | 23 | SRCREV_FORMAT = "llvm_clang" |
25 | 24 | ||