From ce97db12b13754c4baee474076169f831d49b0c1 Mon Sep 17 00:00:00 2001 From: Khem Raj Date: Mon, 4 Apr 2016 02:18:41 +0000 Subject: 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 --- ...nt-include-stdlib.h-and-limits.h-together.patch | 65 ---------------------- recipes-devtools/clang/compiler-rt_git.bb | 3 +- 2 files changed, 1 insertion(+), 67 deletions(-) delete mode 100644 recipes-devtools/clang/compiler-rt/0001-dont-include-stdlib.h-and-limits.h-together.patch 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 @@ -From 69e09408a6a8ddb08d3f148c0eeba68714c1891b Mon Sep 17 00:00:00 2001 -From: Khem Raj -Date: Sun, 3 Apr 2016 07:59:59 +0000 -Subject: [PATCH] dont include stdlib.h and limits.h together - -Signed-off-by: Khem Raj ---- - lib/profile/InstrProfiling.c | 2 +- - lib/profile/InstrProfilingValue.c | 2 +- - lib/sanitizer_common/sanitizer_platform_limits_posix.cc | 2 +- - 3 files changed, 3 insertions(+), 3 deletions(-) - -diff --git a/lib/profile/InstrProfiling.c b/lib/profile/InstrProfiling.c -index 711f2b6..9028be5 100644 ---- a/lib/profile/InstrProfiling.c -+++ b/lib/profile/InstrProfiling.c -@@ -9,9 +9,9 @@ - - #include "InstrProfiling.h" - #include "InstrProfilingInternal.h" -+#include - #include - #include --#include - #include - #define INSTR_PROF_VALUE_PROF_DATA - #include "InstrProfData.inc" -diff --git a/lib/profile/InstrProfilingValue.c b/lib/profile/InstrProfilingValue.c -index 68e16cf..d04cc30 100644 ---- a/lib/profile/InstrProfilingValue.c -+++ b/lib/profile/InstrProfilingValue.c -@@ -9,9 +9,9 @@ - - #include "InstrProfiling.h" - #include "InstrProfilingInternal.h" --#include - #include - #include -+#include - #include - #define INSTR_PROF_VALUE_PROF_DATA - #define INSTR_PROF_COMMON_API_IMPL -diff --git a/lib/sanitizer_common/sanitizer_platform_limits_posix.cc b/lib/sanitizer_common/sanitizer_platform_limits_posix.cc -index b642cba..5d7edcb 100644 ---- a/lib/sanitizer_common/sanitizer_platform_limits_posix.cc -+++ b/lib/sanitizer_common/sanitizer_platform_limits_posix.cc -@@ -32,7 +32,6 @@ - #include - #include - #include --#include - #include - #include - #include -@@ -51,6 +50,7 @@ - #include - #include - #include -+//#include - - #if !SANITIZER_IOS - #include --- -1.9.1 - 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 @@ DESCRIPTION = "LLVM based C/C++ compiler Runtime" HOMEPAGE = "http://compiler-rt.llvm.org/" -LICENSE = "MIT & NCSA" +LICENSE = "MIT | NCSA" SECTION = "base" INHIBIT_DEFAULT_DEPS = "1" @@ -18,7 +18,6 @@ LIC_FILES_CHKSUM = "file://LICENSE.TXT;md5=27b14ab4ce08d04c3a9a5f0ed7997362; \ SRC_URI = "${LLVM_GIT}/compiler-rt.git;protocol=${LLVM_GIT_PROTOCOL};branch=${BRANCH};name=compiler-rt \ file://0001-support-a-new-embedded-linux-target.patch \ file://0001-Simplify-cross-compilation.-Don-t-use-native-compile.patch \ - file://0001-dont-include-stdlib.h-and-limits.h-together.patch \ " SRCREV_FORMAT = "compiler-rt" -- cgit v1.2.3-54-g00ecf