summaryrefslogtreecommitdiffstats
path: root/recipes-devtools/clang/compiler-rt/0001-compiler-rt-Fix-target-architecture-matching.patch
diff options
context:
space:
mode:
authorKhem Raj <raj.khem@gmail.com>2016-07-27 00:54:00 -0700
committerKhem Raj <raj.khem@gmail.com>2016-07-27 00:54:00 -0700
commit79f1d07b76ff1fabb508d9ce232a5e5127d1f3a7 (patch)
treeae4d2088445b0965b57e267fab703548b0f88569 /recipes-devtools/clang/compiler-rt/0001-compiler-rt-Fix-target-architecture-matching.patch
parent07ce0df1231c985d73705f0ba9bae3ddf7125e46 (diff)
downloadmeta-clang-79f1d07b76ff1fabb508d9ce232a5e5127d1f3a7.tar.gz
clang: Update to latest on 3.9 branch
Forward port the patches as needed. Signed-off-by: Khem Raj <raj.khem@gmail.com>
Diffstat (limited to 'recipes-devtools/clang/compiler-rt/0001-compiler-rt-Fix-target-architecture-matching.patch')
-rw-r--r--recipes-devtools/clang/compiler-rt/0001-compiler-rt-Fix-target-architecture-matching.patch37
1 files changed, 37 insertions, 0 deletions
diff --git a/recipes-devtools/clang/compiler-rt/0001-compiler-rt-Fix-target-architecture-matching.patch b/recipes-devtools/clang/compiler-rt/0001-compiler-rt-Fix-target-architecture-matching.patch
new file mode 100644
index 0000000..604d1eb
--- /dev/null
+++ b/recipes-devtools/clang/compiler-rt/0001-compiler-rt-Fix-target-architecture-matching.patch
@@ -0,0 +1,37 @@
1From 921549310c98ac7d594d1f290f053b8e2b3a32d0 Mon Sep 17 00:00:00 2001
2From: Francis Ricci <francisjricci@gmail.com>
3Date: Wed, 20 Jul 2016 18:06:31 +0000
4Subject: [PATCH 1/4] [compiler-rt] Fix target architecture matching
5
6Summary:
7Use stricter comparisons for architecture. This prevents cmake from failing
8for sysroots which can only compile armhf and not arm, since
9arm MATCHES armhf is true, while arm STREQUAL armhf is false.
10
11Reviewers: beanz, compnerd
12
13Subscribers: aemerson, llvm-commits
14
15Differential Revision: https://reviews.llvm.org/D22473
16
17git-svn-id: https://llvm.org/svn/llvm-project/compiler-rt/trunk@276148 91177308-0d34-0410-b5e6-96231b3b80d8
18---
19 cmake/Modules/CompilerRTUtils.cmake | 2 +-
20 1 file changed, 1 insertion(+), 1 deletion(-)
21
22diff --git a/cmake/Modules/CompilerRTUtils.cmake b/cmake/Modules/CompilerRTUtils.cmake
23index 78b6dce..5987cf5 100644
24--- a/cmake/Modules/CompilerRTUtils.cmake
25+++ b/cmake/Modules/CompilerRTUtils.cmake
26@@ -126,7 +126,7 @@ macro(test_target_arch arch def)
27 endif()
28 if(${CAN_TARGET_${arch}})
29 list(APPEND COMPILER_RT_SUPPORTED_ARCH ${arch})
30- elseif("${COMPILER_RT_DEFAULT_TARGET_ARCH}" MATCHES "${arch}" AND
31+ elseif("${COMPILER_RT_DEFAULT_TARGET_ARCH}" STREQUAL "${arch}" AND
32 COMPILER_RT_HAS_EXPLICIT_DEFAULT_TARGET_TRIPLE)
33 # Bail out if we cannot target the architecture we plan to test.
34 message(FATAL_ERROR "Cannot compile for ${arch}:\n${TARGET_${arch}_OUTPUT}")
35--
362.9.0
37