summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorKhem Raj <raj.khem@gmail.com>2016-04-04 02:18:41 +0000
committerKhem Raj <raj.khem@gmail.com>2016-04-04 02:18:41 +0000
commitce97db12b13754c4baee474076169f831d49b0c1 (patch)
tree858afba3b49494c3a9e7a2976b3101a0793944f0
parent35258485141631fd2eff4d668cb5e033b4920ea7 (diff)
downloadmeta-clang-ce97db12b13754c4baee474076169f831d49b0c1.tar.gz
compiler-rt: Remove workaround to order limit.h and stdlib.h
Real isue is use of -ffreestanding, we need to remove that we are targetting linux so its hosted Correct dual lincese logic Signed-off-by: Khem Raj <raj.khem@gmail.com>
-rw-r--r--recipes-devtools/clang/compiler-rt/0001-dont-include-stdlib.h-and-limits.h-together.patch65
-rw-r--r--recipes-devtools/clang/compiler-rt_git.bb3
2 files changed, 1 insertions, 67 deletions
diff --git a/recipes-devtools/clang/compiler-rt/0001-dont-include-stdlib.h-and-limits.h-together.patch b/recipes-devtools/clang/compiler-rt/0001-dont-include-stdlib.h-and-limits.h-together.patch
deleted file mode 100644
index 166ddf8..0000000
--- a/recipes-devtools/clang/compiler-rt/0001-dont-include-stdlib.h-and-limits.h-together.patch
+++ /dev/null
@@ -1,65 +0,0 @@
1From 69e09408a6a8ddb08d3f148c0eeba68714c1891b Mon Sep 17 00:00:00 2001
2From: Khem Raj <raj.khem@gmail.com>
3Date: Sun, 3 Apr 2016 07:59:59 +0000
4Subject: [PATCH] dont include stdlib.h and limits.h together
5
6Signed-off-by: Khem Raj <raj.khem@gmail.com>
7---
8 lib/profile/InstrProfiling.c | 2 +-
9 lib/profile/InstrProfilingValue.c | 2 +-
10 lib/sanitizer_common/sanitizer_platform_limits_posix.cc | 2 +-
11 3 files changed, 3 insertions(+), 3 deletions(-)
12
13diff --git a/lib/profile/InstrProfiling.c b/lib/profile/InstrProfiling.c
14index 711f2b6..9028be5 100644
15--- a/lib/profile/InstrProfiling.c
16+++ b/lib/profile/InstrProfiling.c
17@@ -9,9 +9,9 @@
18
19 #include "InstrProfiling.h"
20 #include "InstrProfilingInternal.h"
21+#include <stdlib.h>
22 #include <limits.h>
23 #include <stdio.h>
24-#include <stdlib.h>
25 #include <string.h>
26 #define INSTR_PROF_VALUE_PROF_DATA
27 #include "InstrProfData.inc"
28diff --git a/lib/profile/InstrProfilingValue.c b/lib/profile/InstrProfilingValue.c
29index 68e16cf..d04cc30 100644
30--- a/lib/profile/InstrProfilingValue.c
31+++ b/lib/profile/InstrProfilingValue.c
32@@ -9,9 +9,9 @@
33
34 #include "InstrProfiling.h"
35 #include "InstrProfilingInternal.h"
36-#include <limits.h>
37 #include <stdio.h>
38 #include <stdlib.h>
39+#include <limits.h>
40 #include <string.h>
41 #define INSTR_PROF_VALUE_PROF_DATA
42 #define INSTR_PROF_COMMON_API_IMPL
43diff --git a/lib/sanitizer_common/sanitizer_platform_limits_posix.cc b/lib/sanitizer_common/sanitizer_platform_limits_posix.cc
44index b642cba..5d7edcb 100644
45--- a/lib/sanitizer_common/sanitizer_platform_limits_posix.cc
46+++ b/lib/sanitizer_common/sanitizer_platform_limits_posix.cc
47@@ -32,7 +32,6 @@
48 #include <dirent.h>
49 #include <errno.h>
50 #include <grp.h>
51-#include <limits.h>
52 #include <net/if.h>
53 #include <netdb.h>
54 #include <poll.h>
55@@ -51,6 +50,7 @@
56 #include <termios.h>
57 #include <time.h>
58 #include <wchar.h>
59+//#include <limits.h>
60
61 #if !SANITIZER_IOS
62 #include <net/route.h>
63--
641.9.1
65
diff --git a/recipes-devtools/clang/compiler-rt_git.bb b/recipes-devtools/clang/compiler-rt_git.bb
index f07f20d..9e18156 100644
--- a/recipes-devtools/clang/compiler-rt_git.bb
+++ b/recipes-devtools/clang/compiler-rt_git.bb
@@ -3,7 +3,7 @@
3 3
4DESCRIPTION = "LLVM based C/C++ compiler Runtime" 4DESCRIPTION = "LLVM based C/C++ compiler Runtime"
5HOMEPAGE = "http://compiler-rt.llvm.org/" 5HOMEPAGE = "http://compiler-rt.llvm.org/"
6LICENSE = "MIT & NCSA" 6LICENSE = "MIT | NCSA"
7SECTION = "base" 7SECTION = "base"
8INHIBIT_DEFAULT_DEPS = "1" 8INHIBIT_DEFAULT_DEPS = "1"
9 9
@@ -18,7 +18,6 @@ LIC_FILES_CHKSUM = "file://LICENSE.TXT;md5=27b14ab4ce08d04c3a9a5f0ed7997362; \
18SRC_URI = "${LLVM_GIT}/compiler-rt.git;protocol=${LLVM_GIT_PROTOCOL};branch=${BRANCH};name=compiler-rt \ 18SRC_URI = "${LLVM_GIT}/compiler-rt.git;protocol=${LLVM_GIT_PROTOCOL};branch=${BRANCH};name=compiler-rt \
19 file://0001-support-a-new-embedded-linux-target.patch \ 19 file://0001-support-a-new-embedded-linux-target.patch \
20 file://0001-Simplify-cross-compilation.-Don-t-use-native-compile.patch \ 20 file://0001-Simplify-cross-compilation.-Don-t-use-native-compile.patch \
21 file://0001-dont-include-stdlib.h-and-limits.h-together.patch \
22 " 21 "
23 22
24SRCREV_FORMAT = "compiler-rt" 23SRCREV_FORMAT = "compiler-rt"