diff options
| author | Alexander Kanavin <alex.kanavin@gmail.com> | 2022-09-01 14:40:46 +0200 |
|---|---|---|
| committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2022-09-02 15:58:25 +0100 |
| commit | 5ee00d7e6882929091e2fbd605d0e328a4df0821 (patch) | |
| tree | 66babbeae25d10e4c4228db7ac6ac5bac619e452 /meta/recipes-devtools/llvm | |
| parent | 84146661b58e35ea80eb0bf8d8e149e3e74d2ebd (diff) | |
| download | poky-5ee00d7e6882929091e2fbd605d0e328a4df0821.tar.gz | |
llvm: remove 0006-llvm-TargetLibraryInfo-Undefine-libc-functions-if-th.patch
At some point this became unnecessary as llvm builds with with musl without it.
(From OE-Core rev: 0469854032ad8ce3f690e84520619d9819263bdc)
Signed-off-by: Alexander Kanavin <alex@linutronix.de>
Signed-off-by: Alexandre Belloni <alexandre.belloni@bootlin.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-devtools/llvm')
| -rw-r--r-- | meta/recipes-devtools/llvm/llvm/0006-llvm-TargetLibraryInfo-Undefine-libc-functions-if-th.patch | 90 | ||||
| -rw-r--r-- | meta/recipes-devtools/llvm/llvm_git.bb | 1 |
2 files changed, 0 insertions, 91 deletions
diff --git a/meta/recipes-devtools/llvm/llvm/0006-llvm-TargetLibraryInfo-Undefine-libc-functions-if-th.patch b/meta/recipes-devtools/llvm/llvm/0006-llvm-TargetLibraryInfo-Undefine-libc-functions-if-th.patch deleted file mode 100644 index d02b7ba6ab..0000000000 --- a/meta/recipes-devtools/llvm/llvm/0006-llvm-TargetLibraryInfo-Undefine-libc-functions-if-th.patch +++ /dev/null | |||
| @@ -1,90 +0,0 @@ | |||
| 1 | Upstream-Status: Pending | ||
| 2 | Signed-off-by: Khem Raj <raj.khem@gmail.com> | ||
| 3 | |||
| 4 | From dbeecdb307be8b783b42cbc89dcb9c5e7f528989 Mon Sep 17 00:00:00 2001 | ||
| 5 | From: Khem Raj <raj.khem@gmail.com> | ||
| 6 | Date: Sat, 21 May 2016 00:33:20 +0000 | ||
| 7 | Subject: [PATCH] llvm: TargetLibraryInfo: Undefine libc functions if they are macros | ||
| 8 | |||
| 9 | musl defines some functions as macros and not inline functions | ||
| 10 | if this is the case then make sure to undefine them | ||
| 11 | |||
| 12 | Signed-off-by: Khem Raj <raj.khem@gmail.com> | ||
| 13 | --- | ||
| 14 | .../llvm/Analysis/TargetLibraryInfo.def | 21 +++++++++++++++++++ | ||
| 15 | 1 file changed, 21 insertions(+) | ||
| 16 | |||
| 17 | diff --git a/llvm/include/llvm/Analysis/TargetLibraryInfo.def b/llvm/include/llvm/Analysis/TargetLibraryInfo.def | ||
| 18 | index afed404f04c..876888656f2 100644 | ||
| 19 | --- a/llvm/include/llvm/Analysis/TargetLibraryInfo.def | ||
| 20 | +++ b/llvm/include/llvm/Analysis/TargetLibraryInfo.def | ||
| 21 | @@ -782,6 +782,9 @@ TLI_DEFINE_STRING_INTERNAL("fmodl") | ||
| 22 | TLI_DEFINE_ENUM_INTERNAL(fopen) | ||
| 23 | TLI_DEFINE_STRING_INTERNAL("fopen") | ||
| 24 | /// FILE *fopen64(const char *filename, const char *opentype) | ||
| 25 | +#ifdef fopen64 | ||
| 26 | +#undef fopen64 | ||
| 27 | +#endif | ||
| 28 | TLI_DEFINE_ENUM_INTERNAL(fopen64) | ||
| 29 | TLI_DEFINE_STRING_INTERNAL("fopen64") | ||
| 30 | /// int fork(); | ||
| 31 | @@ -829,6 +832,9 @@ TLI_DEFINE_STRING_INTERNAL("fseek") | ||
| 32 | /// int fseeko(FILE *stream, off_t offset, int whence); | ||
| 33 | TLI_DEFINE_ENUM_INTERNAL(fseeko) | ||
| 34 | TLI_DEFINE_STRING_INTERNAL("fseeko") | ||
| 35 | +#ifdef fseeko64 | ||
| 36 | +#undef fseeko64 | ||
| 37 | +#endif | ||
| 38 | /// int fseeko64(FILE *stream, off64_t offset, int whence) | ||
| 39 | TLI_DEFINE_ENUM_INTERNAL(fseeko64) | ||
| 40 | TLI_DEFINE_STRING_INTERNAL("fseeko64") | ||
| 41 | @@ -839,6 +845,9 @@ TLI_DEFINE_STRING_INTERNAL("fsetpos") | ||
| 42 | TLI_DEFINE_ENUM_INTERNAL(fstat) | ||
| 43 | TLI_DEFINE_STRING_INTERNAL("fstat") | ||
| 44 | /// int fstat64(int filedes, struct stat64 *buf) | ||
| 45 | +#ifdef fstat64 | ||
| 46 | +#undef fstat64 | ||
| 47 | +#endif | ||
| 48 | TLI_DEFINE_ENUM_INTERNAL(fstat64) | ||
| 49 | TLI_DEFINE_STRING_INTERNAL("fstat64") | ||
| 50 | /// int fstatvfs(int fildes, struct statvfs *buf); | ||
| 51 | @@ -854,6 +863,9 @@ TLI_DEFINE_STRING_INTERNAL("ftell") | ||
| 52 | TLI_DEFINE_ENUM_INTERNAL(ftello) | ||
| 53 | TLI_DEFINE_STRING_INTERNAL("ftello") | ||
| 54 | /// off64_t ftello64(FILE *stream) | ||
| 55 | +#ifdef ftello64 | ||
| 56 | +#undef ftello64 | ||
| 57 | +#endif | ||
| 58 | TLI_DEFINE_ENUM_INTERNAL(ftello64) | ||
| 59 | TLI_DEFINE_STRING_INTERNAL("ftello64") | ||
| 60 | /// int ftrylockfile(FILE *file); | ||
| 61 | @@ -980,6 +992,9 @@ TLI_DEFINE_STRING_INTERNAL("logl") | ||
| 62 | TLI_DEFINE_ENUM_INTERNAL(lstat) | ||
| 63 | TLI_DEFINE_STRING_INTERNAL("lstat") | ||
| 64 | /// int lstat64(const char *path, struct stat64 *buf); | ||
| 65 | +#ifdef lstat64 | ||
| 66 | +#undef lstat64 | ||
| 67 | +#endif | ||
| 68 | TLI_DEFINE_ENUM_INTERNAL(lstat64) | ||
| 69 | TLI_DEFINE_STRING_INTERNAL("lstat64") | ||
| 70 | /// void *malloc(size_t size); | ||
| 71 | @@ -1205,6 +1220,9 @@ TLI_DEFINE_STRING_INTERNAL("sscanf") | ||
| 72 | TLI_DEFINE_ENUM_INTERNAL(stat) | ||
| 73 | TLI_DEFINE_STRING_INTERNAL("stat") | ||
| 74 | /// int stat64(const char *path, struct stat64 *buf); | ||
| 75 | +#ifdef stat64 | ||
| 76 | +#undef stat64 | ||
| 77 | +#endif | ||
| 78 | TLI_DEFINE_ENUM_INTERNAL(stat64) | ||
| 79 | TLI_DEFINE_STRING_INTERNAL("stat64") | ||
| 80 | /// int statvfs(const char *path, struct statvfs *buf); | ||
| 81 | @@ -1340,6 +1358,9 @@ TLI_DEFINE_STRING_INTERNAL("times") | ||
| 82 | TLI_DEFINE_ENUM_INTERNAL(tmpfile) | ||
| 83 | TLI_DEFINE_STRING_INTERNAL("tmpfile") | ||
| 84 | /// FILE *tmpfile64(void) | ||
| 85 | +#ifdef tmpfile64 | ||
| 86 | +#undef tmpfile64 | ||
| 87 | +#endif | ||
| 88 | TLI_DEFINE_ENUM_INTERNAL(tmpfile64) | ||
| 89 | TLI_DEFINE_STRING_INTERNAL("tmpfile64") | ||
| 90 | /// int toascii(int c); | ||
diff --git a/meta/recipes-devtools/llvm/llvm_git.bb b/meta/recipes-devtools/llvm/llvm_git.bb index 4c7fadb667..25c0a433d3 100644 --- a/meta/recipes-devtools/llvm/llvm_git.bb +++ b/meta/recipes-devtools/llvm/llvm_git.bb | |||
| @@ -28,7 +28,6 @@ LLVM_RELEASE = "${PV}" | |||
| 28 | BRANCH = "release/${MAJOR_VERSION}.x" | 28 | BRANCH = "release/${MAJOR_VERSION}.x" |
| 29 | SRCREV = "f28c006a5895fc0e329fe15fead81e37457cb1d1" | 29 | SRCREV = "f28c006a5895fc0e329fe15fead81e37457cb1d1" |
| 30 | SRC_URI = "git://github.com/llvm/llvm-project.git;branch=${BRANCH};protocol=https \ | 30 | SRC_URI = "git://github.com/llvm/llvm-project.git;branch=${BRANCH};protocol=https \ |
| 31 | file://0006-llvm-TargetLibraryInfo-Undefine-libc-functions-if-th.patch;striplevel=2 \ | ||
| 32 | file://0007-llvm-allow-env-override-of-exe-path.patch;striplevel=2 \ | 31 | file://0007-llvm-allow-env-override-of-exe-path.patch;striplevel=2 \ |
| 33 | file://0001-AsmMatcherEmitter-sort-ClassInfo-lists-by-name-as-we.patch;striplevel=2 \ | 32 | file://0001-AsmMatcherEmitter-sort-ClassInfo-lists-by-name-as-we.patch;striplevel=2 \ |
| 34 | file://llvm-config \ | 33 | file://llvm-config \ |
