diff options
-rw-r--r-- | meta/recipes-devtools/clang/clang/0004-llvm-TargetLibraryInfo-Undefine-libc-functions-if-th.patch | 90 | ||||
-rw-r--r-- | meta/recipes-devtools/clang/common.inc | 1 |
2 files changed, 0 insertions, 91 deletions
diff --git a/meta/recipes-devtools/clang/clang/0004-llvm-TargetLibraryInfo-Undefine-libc-functions-if-th.patch b/meta/recipes-devtools/clang/clang/0004-llvm-TargetLibraryInfo-Undefine-libc-functions-if-th.patch deleted file mode 100644 index 88d1c54222..0000000000 --- a/meta/recipes-devtools/clang/clang/0004-llvm-TargetLibraryInfo-Undefine-libc-functions-if-th.patch +++ /dev/null | |||
@@ -1,90 +0,0 @@ | |||
1 | From 04afd5f5cb10ccb899022a6c72ca2f2378eca409 Mon Sep 17 00:00:00 2001 | ||
2 | From: Khem Raj <raj.khem@gmail.com> | ||
3 | Date: Sat, 21 May 2016 00:33:20 +0000 | ||
4 | Subject: [PATCH] llvm: TargetLibraryInfo: Undefine libc functions if they are | ||
5 | macros | ||
6 | |||
7 | musl defines some functions as macros and not inline functions | ||
8 | if this is the case then make sure to undefine them | ||
9 | |||
10 | Upstream-Status: Pending | ||
11 | Signed-off-by: Khem Raj <raj.khem@gmail.com> | ||
12 | --- | ||
13 | .../llvm/Analysis/TargetLibraryInfo.def | 22 ++++++++++++++++++- | ||
14 | 1 file changed, 21 insertions(+), 1 deletion(-) | ||
15 | |||
16 | diff --git a/llvm/include/llvm/Analysis/TargetLibraryInfo.def b/llvm/include/llvm/Analysis/TargetLibraryInfo.def | ||
17 | index 014988299d37..ea77dae66482 100644 | ||
18 | --- a/llvm/include/llvm/Analysis/TargetLibraryInfo.def | ||
19 | +++ b/llvm/include/llvm/Analysis/TargetLibraryInfo.def | ||
20 | @@ -1467,6 +1467,9 @@ TLI_DEFINE_STRING_INTERNAL("fopen") | ||
21 | TLI_DEFINE_SIG_INTERNAL(Ptr, Ptr, Ptr) | ||
22 | |||
23 | /// FILE *fopen64(const char *filename, const char *opentype) | ||
24 | +#ifdef fopen64 | ||
25 | +#undef fopen64 | ||
26 | +#endif | ||
27 | TLI_DEFINE_ENUM_INTERNAL(fopen64) | ||
28 | TLI_DEFINE_STRING_INTERNAL("fopen64") | ||
29 | TLI_DEFINE_SIG_INTERNAL(Ptr, Ptr, Ptr) | ||
30 | @@ -1545,7 +1548,9 @@ TLI_DEFINE_SIG_INTERNAL(Int, Ptr, Long, Int) | ||
31 | TLI_DEFINE_ENUM_INTERNAL(fseeko) | ||
32 | TLI_DEFINE_STRING_INTERNAL("fseeko") | ||
33 | TLI_DEFINE_SIG_INTERNAL(Int, Ptr, IntX, Int) | ||
34 | - | ||
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 | @@ -1562,6 +1567,9 @@ TLI_DEFINE_STRING_INTERNAL("fstat") | ||
42 | TLI_DEFINE_SIG_INTERNAL(Int, Int, Ptr) | ||
43 | |||
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 | TLI_DEFINE_SIG_INTERNAL(Int, Int, Ptr) | ||
51 | @@ -1587,6 +1595,9 @@ TLI_DEFINE_STRING_INTERNAL("ftello") | ||
52 | TLI_DEFINE_SIG_INTERNAL(IntPlus, Ptr) | ||
53 | |||
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 | TLI_DEFINE_SIG_INTERNAL(Int64, Ptr) | ||
61 | @@ -1827,6 +1838,9 @@ TLI_DEFINE_STRING_INTERNAL("lstat") | ||
62 | TLI_DEFINE_SIG_INTERNAL(Int, Ptr, Ptr) | ||
63 | |||
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 | TLI_DEFINE_SIG_INTERNAL(Int, Ptr, Ptr) | ||
71 | @@ -2339,6 +2353,9 @@ TLI_DEFINE_STRING_INTERNAL("stat") | ||
72 | TLI_DEFINE_SIG_INTERNAL(Int, Ptr, Ptr) | ||
73 | |||
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 | TLI_DEFINE_SIG_INTERNAL(Int, Ptr, Ptr) | ||
81 | @@ -2564,6 +2581,9 @@ TLI_DEFINE_STRING_INTERNAL("tmpfile") | ||
82 | TLI_DEFINE_SIG_INTERNAL(Ptr) | ||
83 | |||
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 | TLI_DEFINE_SIG_INTERNAL(Ptr) | ||
diff --git a/meta/recipes-devtools/clang/common.inc b/meta/recipes-devtools/clang/common.inc index b7adc65340..8a7ac57554 100644 --- a/meta/recipes-devtools/clang/common.inc +++ b/meta/recipes-devtools/clang/common.inc | |||
@@ -24,7 +24,6 @@ SRC_URI = "\ | |||
24 | file://0001-libcxxabi-Find-libunwind-headers-when-LIBCXXABI_LIBU.patch \ | 24 | file://0001-libcxxabi-Find-libunwind-headers-when-LIBCXXABI_LIBU.patch \ |
25 | file://0002-compiler-rt-support-a-new-embedded-linux-target.patch \ | 25 | file://0002-compiler-rt-support-a-new-embedded-linux-target.patch \ |
26 | file://0003-compiler-rt-Simplify-cross-compilation.-Don-t-use-na.patch \ | 26 | file://0003-compiler-rt-Simplify-cross-compilation.-Don-t-use-na.patch \ |
27 | file://0004-llvm-TargetLibraryInfo-Undefine-libc-functions-if-th.patch \ | ||
28 | file://0005-llvm-allow-env-override-of-exe-and-libdir-path.patch \ | 27 | file://0005-llvm-allow-env-override-of-exe-and-libdir-path.patch \ |
29 | file://0006-clang-driver-Check-sysroot-for-ldso-path.patch \ | 28 | file://0006-clang-driver-Check-sysroot-for-ldso-path.patch \ |
30 | file://0007-clang-Driver-tools.cpp-Add-lssp_nonshared-on-musl.patch \ | 29 | file://0007-clang-Driver-tools.cpp-Add-lssp_nonshared-on-musl.patch \ |