[OE-core] [PATCH 4/4] llvm: Upgrade to 6.0 release

Martin Jansa martin.jansa at gmail.com
Tue Apr 3 19:05:22 UTC 2018 

Please update mesa.inc to require the new version. Now it depends on
removed 5.0:

meta/recipes-graphics/mesa/mesa.inc:MESA_LLVM_RELEASE ?= "5.0"

On Sun, Apr 1, 2018 at 9:19 AM, Khem Raj <raj.khem at gmail.com> wrote:

> Signed-off-by: Khem Raj <raj.khem at gmail.com>
> ---
>  ...etLibraryInfo-Undefine-libc-functions-if-th.patch | 20
> ++++++++++----------
>  .../0002-llvm-allow-env-override-of-exe-path.patch   |  4 ++--
>  meta/recipes-devtools/llvm/llvm_git.bb               | 11 ++++++-----
>  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 @@
> -From 28293e48cf1a52004c6a78de448718441f9e05f9 Mon Sep 17 00:00:00 2001
> +From 96558c4f25d5132936014f6f2d6252cfdfdf478a Mon Sep 17 00:00:00 2001
>  From: Khem Raj <raj.khem at gmail.com>
>  Date: Sat, 21 May 2016 00:33:20 +0000
>  Subject: [PATCH 1/2] llvm: TargetLibraryInfo: Undefine libc functions if
> they
> @@ -15,10 +15,10 @@ Upstream-Status: Pending
>   1 file changed, 21 insertions(+)
>
>  diff --git a/include/llvm/Analysis/TargetLibraryInfo.def
> b/include/llvm/Analysis/TargetLibraryInfo.def
> -index 9cbe917c146..aff8419cf54 100644
> +index a461ed813b9..f9fd9faeee0 100644
>  --- a/include/llvm/Analysis/TargetLibraryInfo.def
>  +++ b/include/llvm/Analysis/TargetLibraryInfo.def
> -@@ -656,6 +656,9 @@ TLI_DEFINE_STRING_INTERNAL("fmodl")
> +@@ -665,6 +665,9 @@ TLI_DEFINE_STRING_INTERNAL("fmodl")
>   TLI_DEFINE_ENUM_INTERNAL(fopen)
>   TLI_DEFINE_STRING_INTERNAL("fopen")
>   /// FILE *fopen64(const char *filename, const char *opentype)
> @@ -28,7 +28,7 @@ index 9cbe917c146..aff8419cf54 100644
>   TLI_DEFINE_ENUM_INTERNAL(fopen64)
>   TLI_DEFINE_STRING_INTERNAL("fopen64")
>   /// int fprintf(FILE *stream, const char *format, ...);
> -@@ -691,6 +694,9 @@ TLI_DEFINE_STRING_INTERNAL("fseek")
> +@@ -700,6 +703,9 @@ TLI_DEFINE_STRING_INTERNAL("fseek")
>   /// int fseeko(FILE *stream, off_t offset, int whence);
>   TLI_DEFINE_ENUM_INTERNAL(fseeko)
>   TLI_DEFINE_STRING_INTERNAL("fseeko")
> @@ -38,7 +38,7 @@ index 9cbe917c146..aff8419cf54 100644
>   /// int fseeko64(FILE *stream, off64_t offset, int whence)
>   TLI_DEFINE_ENUM_INTERNAL(fseeko64)
>   TLI_DEFINE_STRING_INTERNAL("fseeko64")
> -@@ -701,6 +707,9 @@ TLI_DEFINE_STRING_INTERNAL("fsetpos")
> +@@ -710,6 +716,9 @@ TLI_DEFINE_STRING_INTERNAL("fsetpos")
>   TLI_DEFINE_ENUM_INTERNAL(fstat)
>   TLI_DEFINE_STRING_INTERNAL("fstat")
>   /// int fstat64(int filedes, struct stat64 *buf)
> @@ -48,7 +48,7 @@ index 9cbe917c146..aff8419cf54 100644
>   TLI_DEFINE_ENUM_INTERNAL(fstat64)
>   TLI_DEFINE_STRING_INTERNAL("fstat64")
>   /// int fstatvfs(int fildes, struct statvfs *buf);
> -@@ -716,6 +725,9 @@ TLI_DEFINE_STRING_INTERNAL("ftell")
> +@@ -725,6 +734,9 @@ TLI_DEFINE_STRING_INTERNAL("ftell")
>   TLI_DEFINE_ENUM_INTERNAL(ftello)
>   TLI_DEFINE_STRING_INTERNAL("ftello")
>   /// off64_t ftello64(FILE *stream)
> @@ -58,7 +58,7 @@ index 9cbe917c146..aff8419cf54 100644
>   TLI_DEFINE_ENUM_INTERNAL(ftello64)
>   TLI_DEFINE_STRING_INTERNAL("ftello64")
>   /// int ftrylockfile(FILE *file);
> -@@ -836,6 +848,9 @@ TLI_DEFINE_STRING_INTERNAL("logl")
> +@@ -845,6 +857,9 @@ TLI_DEFINE_STRING_INTERNAL("logl")
>   TLI_DEFINE_ENUM_INTERNAL(lstat)
>   TLI_DEFINE_STRING_INTERNAL("lstat")
>   /// int lstat64(const char *path, struct stat64 *buf);
> @@ -68,7 +68,7 @@ index 9cbe917c146..aff8419cf54 100644
>   TLI_DEFINE_ENUM_INTERNAL(lstat64)
>   TLI_DEFINE_STRING_INTERNAL("lstat64")
>   /// void *malloc(size_t size);
> -@@ -1055,6 +1070,9 @@ TLI_DEFINE_STRING_INTERNAL("sscanf")
> +@@ -1064,6 +1079,9 @@ TLI_DEFINE_STRING_INTERNAL("sscanf")
>   TLI_DEFINE_ENUM_INTERNAL(stat)
>   TLI_DEFINE_STRING_INTERNAL("stat")
>   /// int stat64(const char *path, struct stat64 *buf);
> @@ -78,7 +78,7 @@ index 9cbe917c146..aff8419cf54 100644
>   TLI_DEFINE_ENUM_INTERNAL(stat64)
>   TLI_DEFINE_STRING_INTERNAL("stat64")
>   /// int statvfs(const char *path, struct statvfs *buf);
> -@@ -1184,6 +1202,9 @@ TLI_DEFINE_STRING_INTERNAL("times")
> +@@ -1193,6 +1211,9 @@ TLI_DEFINE_STRING_INTERNAL("times")
>   TLI_DEFINE_ENUM_INTERNAL(tmpfile)
>   TLI_DEFINE_STRING_INTERNAL("tmpfile")
>   /// FILE *tmpfile64(void)
> @@ -89,5 +89,5 @@ index 9cbe917c146..aff8419cf54 100644
>   TLI_DEFINE_STRING_INTERNAL("tmpfile64")
>   /// int toascii(int c);
>  --
> -2.13.1
> +2.16.1
>
> 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 @@
> -From d776487bac17650704614248d19d1e6b35775001 Mon Sep 17 00:00:00 2001
> +From 2f8ea767afdaa440c6368040630e1b3ea6a0977a Mon Sep 17 00:00:00 2001
>  From: Martin Kelly <mkelly at xevo.com>
>  Date: Fri, 19 May 2017 00:22:57 -0700
>  Subject: [PATCH 2/2] llvm: allow env override of exe path
> @@ -35,5 +35,5 @@ index 08b096afb05..d8d7742744e 100644
>     // allow taking the address of ::main however.
>     void *P = (void *)(intptr_t)GetExecutablePath;
>  --
> -2.13.1
> +2.16.1
>
> 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"
>
>  LIC_FILES_CHKSUM = "file://LICENSE.TXT;md5=e825e017edc35cfd58e26116e52517
> 71"
>
> -DEPENDS = "libffi libxml2-native zlib ninja-native llvm-native"
> +DEPENDS = "libffi libxml2 zlib ninja-native llvm-native"
>
>  RDEPENDS_${PN}_append_class-target = " ncurses-terminfo"
>
> @@ -19,10 +19,11 @@ PROVIDES += "llvm${PV}"
>  LLVM_RELEASE = "${PV}"
>  LLVM_DIR = "llvm${LLVM_RELEASE}"
>
> -SRCREV = "81029f142231bde8e119becda112a2173f1459c9"
> -PV = "5.0"
> -PATCH_VERSION = "1"
> -SRC_URI = "git://github.com/llvm-mirror/llvm.git;branch=release_50;
> protocol=http \
> +SRCREV = "089d4c0c490687db6c75f1d074e99c4d42936a50"
> +PV = "6.0"
> +BRANCH = "release_60"
> +PATCH_VERSION = "0"
> +SRC_URI = "git://github.com/llvm-mirror/llvm.git;branch=${BRANCH};
> protocol=http \
>             file://0001-llvm-TargetLibraryInfo-Undefine-libc-functions-if-th.patch
> \
>             file://0002-llvm-allow-env-override-of-exe-path.patch \
>            "
> --
> 2.16.3
>
> --
> _______________________________________________
> Openembedded-core mailing list
> Openembedded-core at lists.openembedded.org
> http://lists.openembedded.org/mailman/listinfo/openembedded-core
>
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.openembedded.org/pipermail/openembedded-core/attachments/20180403/04c6160a/attachment-0002.html>

More information about the Openembedded-core mailing list