From e3cfb373083571aaaaa5a3fc845f3233e629890c Mon Sep 17 00:00:00 2001 From: Khem Raj Date: Wed, 5 Aug 2015 15:06:58 -0700 Subject: clang: Update to latest on release_37 branch Drop the upstreamed patches Signed-off-by: Khem Raj --- ...t-dynamic-linker-when-hard-float-ABI-is-e.patch | 40 ---------------------- recipes-devtools/clang/clang_git.bb | 5 ++- 2 files changed, 2 insertions(+), 43 deletions(-) delete mode 100644 recipes-devtools/clang/clang/0001-Choose-right-dynamic-linker-when-hard-float-ABI-is-e.patch 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 @@ -From c02522a155fdc03f293d58d444c4f030f62d04d6 Mon Sep 17 00:00:00 2001 -From: Khem Raj -Date: Wed, 8 Jul 2015 23:25:36 -0700 -Subject: [PATCH] Choose right dynamic linker when hard float ABI is expressed - on commandline - -Currently trigger to select hard-float linker is only based of -gnueahf -appearing in target triplet, but we should also select it when hardfloat -is requested via cmdline - -Signed-off-by: Khem Raj ---- - lib/Driver/Tools.cpp | 6 ++++-- - 1 file changed, 4 insertions(+), 2 deletions(-) - -diff --git a/tools/clang/lib/Driver/Tools.cpp b/tools/clang/lib/Driver/Tools.cpp -index 38c3d5c..cd3a097 100644 ---- a/tools/clang/lib/Driver/Tools.cpp -+++ b/tools/clang/lib/Driver/Tools.cpp -@@ -7834,13 +7834,15 @@ static std::string getLinuxDynamicLinker(const ArgList &Args, - else if (Arch == llvm::Triple::aarch64_be) - return "/lib/ld-linux-aarch64_be.so.1"; - else if (Arch == llvm::Triple::arm || Arch == llvm::Triple::thumb) { -- if (ToolChain.getTriple().getEnvironment() == llvm::Triple::GNUEABIHF) -+ if (ToolChain.getTriple().getEnvironment() == llvm::Triple::GNUEABIHF || -+ tools::arm::getARMFloatABI(ToolChain.getDriver(), Args, ToolChain.getTriple()) == "hard") - return "/lib/ld-linux-armhf.so.3"; - else - return "/lib/ld-linux.so.3"; - } else if (Arch == llvm::Triple::armeb || Arch == llvm::Triple::thumbeb) { - // TODO: check which dynamic linker name. -- if (ToolChain.getTriple().getEnvironment() == llvm::Triple::GNUEABIHF) -+ if (ToolChain.getTriple().getEnvironment() == llvm::Triple::GNUEABIHF || -+ tools::arm::getARMFloatABI(ToolChain.getDriver(), Args, ToolChain.getTriple()) == "hard") - return "/lib/ld-linux-armhf.so.3"; - else - return "/lib/ld-linux.so.3"; --- -2.1.4 - 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; \ SRC_URI = "git://github.com/llvm-mirror/llvm.git;branch=${BRANCH};name=llvm \ git://github.com/llvm-mirror/clang.git;branch=${BRANCH};destsuffix=git/tools/clang;name=clang \ file://0001-Remove-CMAKE_CROSSCOMPILING-so-it-can-cross-compile.patch \ - file://0001-Choose-right-dynamic-linker-when-hard-float-ABI-is-e.patch \ " -SRCREV_llvm = "9dd0401722fd60349c00d0714666f0db3f7a4067" -SRCREV_clang = "219ecbfdcb845d9657e202500bb75beae99a7688" +SRCREV_llvm = "937d48bea8f01b02d5f3db05a9e58dfb976e9d3b" +SRCREV_clang = "0c0116f5826045008e6627967abe0e9320700e2b" SRCREV_FORMAT = "llvm_clang" -- cgit v1.2.3-54-g00ecf