Brad Bishop | 316dfdd | 2018-06-25 12:45:53 -0400 | [diff] [blame] | 1 | From 96558c4f25d5132936014f6f2d6252cfdfdf478a Mon Sep 17 00:00:00 2001 |
Brad Bishop | d7bf8c1 | 2018-02-25 22:55:05 -0500 | [diff] [blame] | 2 | From: Khem Raj <raj.khem@gmail.com> |
| 3 | Date: Sat, 21 May 2016 00:33:20 +0000 |
| 4 | Subject: [PATCH 1/2] llvm: TargetLibraryInfo: Undefine libc functions if they |
| 5 | are 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 | Signed-off-by: Khem Raj <raj.khem@gmail.com> |
| 11 | --- |
| 12 | Upstream-Status: Pending |
| 13 | |
| 14 | include/llvm/Analysis/TargetLibraryInfo.def | 21 +++++++++++++++++++++ |
| 15 | 1 file changed, 21 insertions(+) |
| 16 | |
| 17 | diff --git a/include/llvm/Analysis/TargetLibraryInfo.def b/include/llvm/Analysis/TargetLibraryInfo.def |
Brad Bishop | 316dfdd | 2018-06-25 12:45:53 -0400 | [diff] [blame] | 18 | index a461ed813b9..f9fd9faeee0 100644 |
Brad Bishop | d7bf8c1 | 2018-02-25 22:55:05 -0500 | [diff] [blame] | 19 | --- a/include/llvm/Analysis/TargetLibraryInfo.def |
| 20 | +++ b/include/llvm/Analysis/TargetLibraryInfo.def |
Brad Bishop | 316dfdd | 2018-06-25 12:45:53 -0400 | [diff] [blame] | 21 | @@ -665,6 +665,9 @@ TLI_DEFINE_STRING_INTERNAL("fmodl") |
Brad Bishop | d7bf8c1 | 2018-02-25 22:55:05 -0500 | [diff] [blame] | 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 fprintf(FILE *stream, const char *format, ...); |
Brad Bishop | 316dfdd | 2018-06-25 12:45:53 -0400 | [diff] [blame] | 31 | @@ -700,6 +703,9 @@ TLI_DEFINE_STRING_INTERNAL("fseek") |
Brad Bishop | d7bf8c1 | 2018-02-25 22:55:05 -0500 | [diff] [blame] | 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") |
Brad Bishop | 316dfdd | 2018-06-25 12:45:53 -0400 | [diff] [blame] | 41 | @@ -710,6 +716,9 @@ TLI_DEFINE_STRING_INTERNAL("fsetpos") |
Brad Bishop | d7bf8c1 | 2018-02-25 22:55:05 -0500 | [diff] [blame] | 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); |
Brad Bishop | 316dfdd | 2018-06-25 12:45:53 -0400 | [diff] [blame] | 51 | @@ -725,6 +734,9 @@ TLI_DEFINE_STRING_INTERNAL("ftell") |
Brad Bishop | d7bf8c1 | 2018-02-25 22:55:05 -0500 | [diff] [blame] | 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); |
Brad Bishop | 316dfdd | 2018-06-25 12:45:53 -0400 | [diff] [blame] | 61 | @@ -845,6 +857,9 @@ TLI_DEFINE_STRING_INTERNAL("logl") |
Brad Bishop | d7bf8c1 | 2018-02-25 22:55:05 -0500 | [diff] [blame] | 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); |
Brad Bishop | 316dfdd | 2018-06-25 12:45:53 -0400 | [diff] [blame] | 71 | @@ -1064,6 +1079,9 @@ TLI_DEFINE_STRING_INTERNAL("sscanf") |
Brad Bishop | d7bf8c1 | 2018-02-25 22:55:05 -0500 | [diff] [blame] | 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); |
Brad Bishop | 316dfdd | 2018-06-25 12:45:53 -0400 | [diff] [blame] | 81 | @@ -1193,6 +1211,9 @@ TLI_DEFINE_STRING_INTERNAL("times") |
Brad Bishop | d7bf8c1 | 2018-02-25 22:55:05 -0500 | [diff] [blame] | 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); |
| 91 | -- |
Brad Bishop | 316dfdd | 2018-06-25 12:45:53 -0400 | [diff] [blame] | 92 | 2.16.1 |
Brad Bishop | d7bf8c1 | 2018-02-25 22:55:05 -0500 | [diff] [blame] | 93 | |