summaryrefslogtreecommitdiffstats
path: root/meta/recipes-devtools
diff options
context:
space:
mode:
authorKhem Raj <raj.khem@gmail.com>2018-04-01 00:19:46 -0700
committerRichard Purdie <richard.purdie@linuxfoundation.org>2018-04-05 14:49:08 +0100
commit4880d0f9c808fd50f3eba0d87a804b4dce1334fa (patch)
tree2c287e3eee30c1df15b7b4bde0f7db4e3153a6c1 /meta/recipes-devtools
parent21f76439398728be919421499a3eb92a7c0d8552 (diff)
downloadpoky-4880d0f9c808fd50f3eba0d87a804b4dce1334fa.tar.gz
llvm: Upgrade to 6.0 release
(From OE-Core rev: 67379117375bcc143f636ccd56e548332b19325f) Signed-off-by: Khem Raj <raj.khem@gmail.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-devtools')
-rw-r--r--meta/recipes-devtools/llvm/llvm/0001-llvm-TargetLibraryInfo-Undefine-libc-functions-if-th.patch20
-rw-r--r--meta/recipes-devtools/llvm/llvm/0002-llvm-allow-env-override-of-exe-path.patch4
-rw-r--r--meta/recipes-devtools/llvm/llvm_git.bb11
3 files changed, 18 insertions, 17 deletions
diff --git a/meta/recipes-devtools/llvm/llvm/0001-llvm-TargetLibraryInfo-Undefine-libc-functions-if-th.patch b/meta/recipes-devtools/llvm/llvm/0001-llvm-TargetLibraryInfo-Undefine-libc-functions-if-th.patch
index e251799259..209764c8ba 100644
--- a/meta/recipes-devtools/llvm/llvm/0001-llvm-TargetLibraryInfo-Undefine-libc-functions-if-th.patch
+++ b/meta/recipes-devtools/llvm/llvm/0001-llvm-TargetLibraryInfo-Undefine-libc-functions-if-th.patch
@@ -1,4 +1,4 @@
1From 28293e48cf1a52004c6a78de448718441f9e05f9 Mon Sep 17 00:00:00 2001 1From 96558c4f25d5132936014f6f2d6252cfdfdf478a Mon Sep 17 00:00:00 2001
2From: Khem Raj <raj.khem@gmail.com> 2From: Khem Raj <raj.khem@gmail.com>
3Date: Sat, 21 May 2016 00:33:20 +0000 3Date: Sat, 21 May 2016 00:33:20 +0000
4Subject: [PATCH 1/2] llvm: TargetLibraryInfo: Undefine libc functions if they 4Subject: [PATCH 1/2] llvm: TargetLibraryInfo: Undefine libc functions if they
@@ -15,10 +15,10 @@ Upstream-Status: Pending
15 1 file changed, 21 insertions(+) 15 1 file changed, 21 insertions(+)
16 16
17diff --git a/include/llvm/Analysis/TargetLibraryInfo.def b/include/llvm/Analysis/TargetLibraryInfo.def 17diff --git a/include/llvm/Analysis/TargetLibraryInfo.def b/include/llvm/Analysis/TargetLibraryInfo.def
18index 9cbe917c146..aff8419cf54 100644 18index a461ed813b9..f9fd9faeee0 100644
19--- a/include/llvm/Analysis/TargetLibraryInfo.def 19--- a/include/llvm/Analysis/TargetLibraryInfo.def
20+++ b/include/llvm/Analysis/TargetLibraryInfo.def 20+++ b/include/llvm/Analysis/TargetLibraryInfo.def
21@@ -656,6 +656,9 @@ TLI_DEFINE_STRING_INTERNAL("fmodl") 21@@ -665,6 +665,9 @@ TLI_DEFINE_STRING_INTERNAL("fmodl")
22 TLI_DEFINE_ENUM_INTERNAL(fopen) 22 TLI_DEFINE_ENUM_INTERNAL(fopen)
23 TLI_DEFINE_STRING_INTERNAL("fopen") 23 TLI_DEFINE_STRING_INTERNAL("fopen")
24 /// FILE *fopen64(const char *filename, const char *opentype) 24 /// FILE *fopen64(const char *filename, const char *opentype)
@@ -28,7 +28,7 @@ index 9cbe917c146..aff8419cf54 100644
28 TLI_DEFINE_ENUM_INTERNAL(fopen64) 28 TLI_DEFINE_ENUM_INTERNAL(fopen64)
29 TLI_DEFINE_STRING_INTERNAL("fopen64") 29 TLI_DEFINE_STRING_INTERNAL("fopen64")
30 /// int fprintf(FILE *stream, const char *format, ...); 30 /// int fprintf(FILE *stream, const char *format, ...);
31@@ -691,6 +694,9 @@ TLI_DEFINE_STRING_INTERNAL("fseek") 31@@ -700,6 +703,9 @@ TLI_DEFINE_STRING_INTERNAL("fseek")
32 /// int fseeko(FILE *stream, off_t offset, int whence); 32 /// int fseeko(FILE *stream, off_t offset, int whence);
33 TLI_DEFINE_ENUM_INTERNAL(fseeko) 33 TLI_DEFINE_ENUM_INTERNAL(fseeko)
34 TLI_DEFINE_STRING_INTERNAL("fseeko") 34 TLI_DEFINE_STRING_INTERNAL("fseeko")
@@ -38,7 +38,7 @@ index 9cbe917c146..aff8419cf54 100644
38 /// int fseeko64(FILE *stream, off64_t offset, int whence) 38 /// int fseeko64(FILE *stream, off64_t offset, int whence)
39 TLI_DEFINE_ENUM_INTERNAL(fseeko64) 39 TLI_DEFINE_ENUM_INTERNAL(fseeko64)
40 TLI_DEFINE_STRING_INTERNAL("fseeko64") 40 TLI_DEFINE_STRING_INTERNAL("fseeko64")
41@@ -701,6 +707,9 @@ TLI_DEFINE_STRING_INTERNAL("fsetpos") 41@@ -710,6 +716,9 @@ TLI_DEFINE_STRING_INTERNAL("fsetpos")
42 TLI_DEFINE_ENUM_INTERNAL(fstat) 42 TLI_DEFINE_ENUM_INTERNAL(fstat)
43 TLI_DEFINE_STRING_INTERNAL("fstat") 43 TLI_DEFINE_STRING_INTERNAL("fstat")
44 /// int fstat64(int filedes, struct stat64 *buf) 44 /// int fstat64(int filedes, struct stat64 *buf)
@@ -48,7 +48,7 @@ index 9cbe917c146..aff8419cf54 100644
48 TLI_DEFINE_ENUM_INTERNAL(fstat64) 48 TLI_DEFINE_ENUM_INTERNAL(fstat64)
49 TLI_DEFINE_STRING_INTERNAL("fstat64") 49 TLI_DEFINE_STRING_INTERNAL("fstat64")
50 /// int fstatvfs(int fildes, struct statvfs *buf); 50 /// int fstatvfs(int fildes, struct statvfs *buf);
51@@ -716,6 +725,9 @@ TLI_DEFINE_STRING_INTERNAL("ftell") 51@@ -725,6 +734,9 @@ TLI_DEFINE_STRING_INTERNAL("ftell")
52 TLI_DEFINE_ENUM_INTERNAL(ftello) 52 TLI_DEFINE_ENUM_INTERNAL(ftello)
53 TLI_DEFINE_STRING_INTERNAL("ftello") 53 TLI_DEFINE_STRING_INTERNAL("ftello")
54 /// off64_t ftello64(FILE *stream) 54 /// off64_t ftello64(FILE *stream)
@@ -58,7 +58,7 @@ index 9cbe917c146..aff8419cf54 100644
58 TLI_DEFINE_ENUM_INTERNAL(ftello64) 58 TLI_DEFINE_ENUM_INTERNAL(ftello64)
59 TLI_DEFINE_STRING_INTERNAL("ftello64") 59 TLI_DEFINE_STRING_INTERNAL("ftello64")
60 /// int ftrylockfile(FILE *file); 60 /// int ftrylockfile(FILE *file);
61@@ -836,6 +848,9 @@ TLI_DEFINE_STRING_INTERNAL("logl") 61@@ -845,6 +857,9 @@ TLI_DEFINE_STRING_INTERNAL("logl")
62 TLI_DEFINE_ENUM_INTERNAL(lstat) 62 TLI_DEFINE_ENUM_INTERNAL(lstat)
63 TLI_DEFINE_STRING_INTERNAL("lstat") 63 TLI_DEFINE_STRING_INTERNAL("lstat")
64 /// int lstat64(const char *path, struct stat64 *buf); 64 /// int lstat64(const char *path, struct stat64 *buf);
@@ -68,7 +68,7 @@ index 9cbe917c146..aff8419cf54 100644
68 TLI_DEFINE_ENUM_INTERNAL(lstat64) 68 TLI_DEFINE_ENUM_INTERNAL(lstat64)
69 TLI_DEFINE_STRING_INTERNAL("lstat64") 69 TLI_DEFINE_STRING_INTERNAL("lstat64")
70 /// void *malloc(size_t size); 70 /// void *malloc(size_t size);
71@@ -1055,6 +1070,9 @@ TLI_DEFINE_STRING_INTERNAL("sscanf") 71@@ -1064,6 +1079,9 @@ TLI_DEFINE_STRING_INTERNAL("sscanf")
72 TLI_DEFINE_ENUM_INTERNAL(stat) 72 TLI_DEFINE_ENUM_INTERNAL(stat)
73 TLI_DEFINE_STRING_INTERNAL("stat") 73 TLI_DEFINE_STRING_INTERNAL("stat")
74 /// int stat64(const char *path, struct stat64 *buf); 74 /// int stat64(const char *path, struct stat64 *buf);
@@ -78,7 +78,7 @@ index 9cbe917c146..aff8419cf54 100644
78 TLI_DEFINE_ENUM_INTERNAL(stat64) 78 TLI_DEFINE_ENUM_INTERNAL(stat64)
79 TLI_DEFINE_STRING_INTERNAL("stat64") 79 TLI_DEFINE_STRING_INTERNAL("stat64")
80 /// int statvfs(const char *path, struct statvfs *buf); 80 /// int statvfs(const char *path, struct statvfs *buf);
81@@ -1184,6 +1202,9 @@ TLI_DEFINE_STRING_INTERNAL("times") 81@@ -1193,6 +1211,9 @@ TLI_DEFINE_STRING_INTERNAL("times")
82 TLI_DEFINE_ENUM_INTERNAL(tmpfile) 82 TLI_DEFINE_ENUM_INTERNAL(tmpfile)
83 TLI_DEFINE_STRING_INTERNAL("tmpfile") 83 TLI_DEFINE_STRING_INTERNAL("tmpfile")
84 /// FILE *tmpfile64(void) 84 /// FILE *tmpfile64(void)
@@ -89,5 +89,5 @@ index 9cbe917c146..aff8419cf54 100644
89 TLI_DEFINE_STRING_INTERNAL("tmpfile64") 89 TLI_DEFINE_STRING_INTERNAL("tmpfile64")
90 /// int toascii(int c); 90 /// int toascii(int c);
91-- 91--
922.13.1 922.16.1
93 93
diff --git a/meta/recipes-devtools/llvm/llvm/0002-llvm-allow-env-override-of-exe-path.patch b/meta/recipes-devtools/llvm/llvm/0002-llvm-allow-env-override-of-exe-path.patch
index 832bd729ef..21d2f81b58 100644
--- a/meta/recipes-devtools/llvm/llvm/0002-llvm-allow-env-override-of-exe-path.patch
+++ b/meta/recipes-devtools/llvm/llvm/0002-llvm-allow-env-override-of-exe-path.patch
@@ -1,4 +1,4 @@
1From d776487bac17650704614248d19d1e6b35775001 Mon Sep 17 00:00:00 2001 1From 2f8ea767afdaa440c6368040630e1b3ea6a0977a Mon Sep 17 00:00:00 2001
2From: Martin Kelly <mkelly@xevo.com> 2From: Martin Kelly <mkelly@xevo.com>
3Date: Fri, 19 May 2017 00:22:57 -0700 3Date: Fri, 19 May 2017 00:22:57 -0700
4Subject: [PATCH 2/2] llvm: allow env override of exe path 4Subject: [PATCH 2/2] llvm: allow env override of exe path
@@ -35,5 +35,5 @@ index 08b096afb05..d8d7742744e 100644
35 // allow taking the address of ::main however. 35 // allow taking the address of ::main however.
36 void *P = (void *)(intptr_t)GetExecutablePath; 36 void *P = (void *)(intptr_t)GetExecutablePath;
37-- 37--
382.13.1 382.16.1
39 39
diff --git a/meta/recipes-devtools/llvm/llvm_git.bb b/meta/recipes-devtools/llvm/llvm_git.bb
index de06e12ae4..77c095d9a3 100644
--- a/meta/recipes-devtools/llvm/llvm_git.bb
+++ b/meta/recipes-devtools/llvm/llvm_git.bb
@@ -8,7 +8,7 @@ SECTION = "devel"
8 8
9LIC_FILES_CHKSUM = "file://LICENSE.TXT;md5=e825e017edc35cfd58e26116e5251771" 9LIC_FILES_CHKSUM = "file://LICENSE.TXT;md5=e825e017edc35cfd58e26116e5251771"
10 10
11DEPENDS = "libffi libxml2-native zlib ninja-native llvm-native" 11DEPENDS = "libffi libxml2 zlib ninja-native llvm-native"
12 12
13RDEPENDS_${PN}_append_class-target = " ncurses-terminfo" 13RDEPENDS_${PN}_append_class-target = " ncurses-terminfo"
14 14
@@ -19,10 +19,11 @@ PROVIDES += "llvm${PV}"
19LLVM_RELEASE = "${PV}" 19LLVM_RELEASE = "${PV}"
20LLVM_DIR = "llvm${LLVM_RELEASE}" 20LLVM_DIR = "llvm${LLVM_RELEASE}"
21 21
22SRCREV = "81029f142231bde8e119becda112a2173f1459c9" 22SRCREV = "089d4c0c490687db6c75f1d074e99c4d42936a50"
23PV = "5.0" 23PV = "6.0"
24PATCH_VERSION = "1" 24BRANCH = "release_60"
25SRC_URI = "git://github.com/llvm-mirror/llvm.git;branch=release_50;protocol=http \ 25PATCH_VERSION = "0"
26SRC_URI = "git://github.com/llvm-mirror/llvm.git;branch=${BRANCH};protocol=http \
26 file://0001-llvm-TargetLibraryInfo-Undefine-libc-functions-if-th.patch \ 27 file://0001-llvm-TargetLibraryInfo-Undefine-libc-functions-if-th.patch \
27 file://0002-llvm-allow-env-override-of-exe-path.patch \ 28 file://0002-llvm-allow-env-override-of-exe-path.patch \
28 " 29 "