clang: Fix build with musl

Signed-off-by: Khem Raj <raj.khem@gmail.com>

3 files changed, 63 insertions, 128 deletions

diff --git a/recipes-devtools/clang/clang/0004-llvm-TargetLibraryInfo-Undefine-libc-functions-if-th.patch b/recipes-devtools/clang/clang/0004-llvm-TargetLibraryInfo-Undefine-libc-functions-if-th.patch
new file mode 100644
index 0000000..949a1ea
--- /dev/null
+++ b/recipes-devtools/clang/clang/0004-llvm-TargetLibraryInfo-Undefine-libc-functions-if-th.patch
@@ -0,0 +1,61 @@
+From b1b73874dc3b81e6dd5e05b9f00b2010c9ab18fb Mon Sep 17 00:00:00 2001
+From: Khem Raj <raj.khem@gmail.com>
+Date: Sat, 21 May 2016 00:33:20 +0000
+Subject: [PATCH] llvm: TargetLibraryInfo: Undefine libc functions if they are
+ macros
+
+musl defines some functions as macros and not inline functions
+if this is the case then make sure to undefine them
+
+Signed-off-by: Khem Raj <raj.khem@gmail.com>
+---
+ include/llvm/Analysis/TargetLibraryInfo.def | 12 ++++++++++++
+ 1 file changed, 12 insertions(+)
+
+diff --git a/include/llvm/Analysis/TargetLibraryInfo.def b/include/llvm/Analysis/TargetLibraryInfo.def
+index b2a593d..834f257 100644
+--- a/include/llvm/Analysis/TargetLibraryInfo.def
++++ b/include/llvm/Analysis/TargetLibraryInfo.def
+@@ -531,6 +531,9 @@ TLI_DEFINE_STRING_INTERNAL("fmodl")
+ TLI_DEFINE_ENUM_INTERNAL(fopen)
+ TLI_DEFINE_STRING_INTERNAL("fopen")
+ /// FILE *fopen64(const char *filename, const char *opentype)
++#ifdef fopen64
++#undef fopen64
++#endif
+ TLI_DEFINE_ENUM_INTERNAL(fopen64)
+ TLI_DEFINE_STRING_INTERNAL("fopen64")
+ /// int fprintf(FILE *stream, const char *format, ...);
+@@ -566,6 +569,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")
++#ifdef fseeko64
++#undef fseeko64
++#endif
+ /// int fseeko64(FILE *stream, off64_t offset, int whence)
+ TLI_DEFINE_ENUM_INTERNAL(fseeko64)
+ TLI_DEFINE_STRING_INTERNAL("fseeko64")
+@@ -591,6 +597,9 @@ TLI_DEFINE_STRING_INTERNAL("ftell")
+ TLI_DEFINE_ENUM_INTERNAL(ftello)
+ TLI_DEFINE_STRING_INTERNAL("ftello")
+ /// off64_t ftello64(FILE *stream)
++#ifdef ftello64
++#undef ftello64
++#endif
+ TLI_DEFINE_ENUM_INTERNAL(ftello64)
+ TLI_DEFINE_STRING_INTERNAL("ftello64")
+ /// int ftrylockfile(FILE *file);
+@@ -1056,6 +1065,9 @@ TLI_DEFINE_STRING_INTERNAL("times")
+ TLI_DEFINE_ENUM_INTERNAL(tmpfile)
+ TLI_DEFINE_STRING_INTERNAL("tmpfile")
+ /// FILE *tmpfile64(void)
++#ifdef tmpfile64
++#undef tmpfile64
++#endif
+ TLI_DEFINE_ENUM_INTERNAL(tmpfile64)
+ TLI_DEFINE_STRING_INTERNAL("tmpfile64")
+ /// int toascii(int c);
+-- 
+1.8.3.1
+
diff --git a/recipes-devtools/clang/clang/0004-llvm-remove-fopen64-fseeko64-ftello64-tmpfile64-on-m.patch b/recipes-devtools/clang/clang/0004-llvm-remove-fopen64-fseeko64-ftello64-tmpfile64-on-m.patch
deleted file mode 100644
index 7c78e21..0000000
--- a/recipes-devtools/clang/clang/0004-llvm-remove-fopen64-fseeko64-ftello64-tmpfile64-on-m.patch
+++ /dev/null
@@ -1,126 +0,0 @@
-From bc8a39484dc4db80baa846438a6908e2f9572572 Mon Sep 17 00:00:00 2001
-From: Khem Raj <raj.khem@gmail.com>
-Date: Thu, 19 May 2016 22:52:05 -0700
-Subject: [PATCH 4/4] llvm: remove fopen64/fseeko64/ftello64/tmpfile64 on musl
-
-They are not available
-
-Signed-off-by: Khem Raj <raj.khem@gmail.com>
----
- include/llvm/Analysis/TargetLibraryInfo.def | 12 ------------
- lib/Analysis/TargetLibraryInfo.cpp          | 13 -------------
- lib/Transforms/Utils/BuildLibCalls.cpp      | 17 -----------------
- 3 files changed, 42 deletions(-)
-
-diff --git a/include/llvm/Analysis/TargetLibraryInfo.def b/include/llvm/Analysis/TargetLibraryInfo.def
-index b2a593d..7bfafcc 100644
---- a/include/llvm/Analysis/TargetLibraryInfo.def
-+++ b/include/llvm/Analysis/TargetLibraryInfo.def
-@@ -530,9 +530,6 @@ TLI_DEFINE_STRING_INTERNAL("fmodl")
- /// FILE *fopen(const char *filename, const char *mode);
- TLI_DEFINE_ENUM_INTERNAL(fopen)
- TLI_DEFINE_STRING_INTERNAL("fopen")
--/// FILE *fopen64(const char *filename, const char *opentype)
--TLI_DEFINE_ENUM_INTERNAL(fopen64)
--TLI_DEFINE_STRING_INTERNAL("fopen64")
- /// int fprintf(FILE *stream, const char *format, ...);
- TLI_DEFINE_ENUM_INTERNAL(fprintf)
- TLI_DEFINE_STRING_INTERNAL("fprintf")
-@@ -566,9 +563,6 @@ TLI_DEFINE_STRING_INTERNAL("fseek")
- /// int fseeko(FILE *stream, off_t offset, int whence);
- TLI_DEFINE_ENUM_INTERNAL(fseeko)
- TLI_DEFINE_STRING_INTERNAL("fseeko")
--/// int fseeko64(FILE *stream, off64_t offset, int whence)
--TLI_DEFINE_ENUM_INTERNAL(fseeko64)
--TLI_DEFINE_STRING_INTERNAL("fseeko64")
- /// int fsetpos(FILE *stream, const fpos_t *pos);
- TLI_DEFINE_ENUM_INTERNAL(fsetpos)
- TLI_DEFINE_STRING_INTERNAL("fsetpos")
-@@ -590,9 +584,6 @@ TLI_DEFINE_STRING_INTERNAL("ftell")
- /// off_t ftello(FILE *stream);
- TLI_DEFINE_ENUM_INTERNAL(ftello)
- TLI_DEFINE_STRING_INTERNAL("ftello")
--/// off64_t ftello64(FILE *stream)
--TLI_DEFINE_ENUM_INTERNAL(ftello64)
--TLI_DEFINE_STRING_INTERNAL("ftello64")
- /// int ftrylockfile(FILE *file);
- TLI_DEFINE_ENUM_INTERNAL(ftrylockfile)
- TLI_DEFINE_STRING_INTERNAL("ftrylockfile")
-@@ -1055,9 +1046,6 @@ TLI_DEFINE_STRING_INTERNAL("times")
- /// FILE *tmpfile(void);
- TLI_DEFINE_ENUM_INTERNAL(tmpfile)
- TLI_DEFINE_STRING_INTERNAL("tmpfile")
--/// FILE *tmpfile64(void)
--TLI_DEFINE_ENUM_INTERNAL(tmpfile64)
--TLI_DEFINE_STRING_INTERNAL("tmpfile64")
- /// int toascii(int c);
- TLI_DEFINE_ENUM_INTERNAL(toascii)
- TLI_DEFINE_STRING_INTERNAL("toascii")
-diff --git a/lib/Analysis/TargetLibraryInfo.cpp b/lib/Analysis/TargetLibraryInfo.cpp
-index 71f15b15..6d98f06 100644
---- a/lib/Analysis/TargetLibraryInfo.cpp
-+++ b/lib/Analysis/TargetLibraryInfo.cpp
-@@ -375,16 +375,12 @@ static void initialize(TargetLibraryInfoImpl &TLI, const Triple &T,
-     TLI.setUnavailable(LibFunc::under_IO_getc);
-     TLI.setUnavailable(LibFunc::under_IO_putc);
-     TLI.setUnavailable(LibFunc::memalign);
--    TLI.setUnavailable(LibFunc::fopen64);
--    TLI.setUnavailable(LibFunc::fseeko64);
-     TLI.setUnavailable(LibFunc::fstat64);
-     TLI.setUnavailable(LibFunc::fstatvfs64);
--    TLI.setUnavailable(LibFunc::ftello64);
-     TLI.setUnavailable(LibFunc::lstat64);
-     TLI.setUnavailable(LibFunc::open64);
-     TLI.setUnavailable(LibFunc::stat64);
-     TLI.setUnavailable(LibFunc::statvfs64);
--    TLI.setUnavailable(LibFunc::tmpfile64);
-   }
- 
-   // As currently implemented in clang, NVPTX code has no standard library to
-@@ -861,15 +857,6 @@ bool TargetLibraryInfoImpl::isValidProtoForLibFunc(const FunctionType &FTy,
-   case LibFunc::dunder_isoc99_sscanf:
-     return (NumParams >= 1 && FTy.getParamType(0)->isPointerTy() &&
-             FTy.getParamType(1)->isPointerTy());
--  case LibFunc::fopen64:
--    return (NumParams == 2 && FTy.getReturnType()->isPointerTy() &&
--            FTy.getParamType(0)->isPointerTy() &&
--            FTy.getParamType(1)->isPointerTy());
--  case LibFunc::fseeko64:
--  case LibFunc::ftello64:
--    return (NumParams == 0 && FTy.getParamType(0)->isPointerTy());
--  case LibFunc::tmpfile64:
--    return (FTy.getReturnType()->isPointerTy());
-   case LibFunc::fstat64:
-   case LibFunc::fstatvfs64:
-     return (NumParams == 2 && FTy.getParamType(1)->isPointerTy());
-diff --git a/lib/Transforms/Utils/BuildLibCalls.cpp b/lib/Transforms/Utils/BuildLibCalls.cpp
-index f4260a9..a9e673f 100644
---- a/lib/Transforms/Utils/BuildLibCalls.cpp
-+++ b/lib/Transforms/Utils/BuildLibCalls.cpp
-@@ -638,23 +638,6 @@ bool llvm::inferLibFuncAttributes(Function &F, const TargetLibraryInfo &TLI) {
-     Changed |= setOnlyReadsMemory(F, 1);
-     Changed |= setOnlyReadsMemory(F, 2);
-     return Changed;
--  case LibFunc::fopen64:
--    Changed |= setDoesNotThrow(F);
--    Changed |= setDoesNotAlias(F, 0);
--    Changed |= setDoesNotCapture(F, 1);
--    Changed |= setDoesNotCapture(F, 2);
--    Changed |= setOnlyReadsMemory(F, 1);
--    Changed |= setOnlyReadsMemory(F, 2);
--    return Changed;
--  case LibFunc::fseeko64:
--  case LibFunc::ftello64:
--    Changed |= setDoesNotThrow(F);
--    Changed |= setDoesNotCapture(F, 1);
--    return Changed;
--  case LibFunc::tmpfile64:
--    Changed |= setDoesNotThrow(F);
--    Changed |= setDoesNotAlias(F, 0);
--    return Changed;
-   case LibFunc::fstat64:
-   case LibFunc::fstatvfs64:
-     Changed |= setDoesNotThrow(F);
--- 
-2.8.2
-
diff --git a/recipes-devtools/clang/clang_git.bb b/recipes-devtools/clang/clang_git.bb
index b6804ac..5809478 100644
--- a/recipes-devtools/clang/clang_git.bb
+++ b/recipes-devtools/clang/clang_git.bb
@@ -18,7 +18,7 @@ SRC_URI = "${LLVM_GIT}/llvm.git;protocol=${LLVM_GIT_PROTOCOL};branch=${BRANCH};n
            file://0001-llvm-triplet-Add-musl-support.patch \
            file://0002-llvm-Remove-CMAKE_CROSSCOMPILING-so-it-can-cross-com.patch \
            file://0003-llvm-Do-not-assume-linux-glibc.patch \
-           file://0004-llvm-remove-fopen64-fseeko64-ftello64-tmpfile64-on-m.patch \
+           file://0004-llvm-TargetLibraryInfo-Undefine-libc-functions-if-th.patch \
            file://0001-clang-driver-Add-musl-ldso-support.patch;patchdir=tools/clang \
            file://0002-clang-driver-Use-lib-for-ldso-on-OE.patch;patchdir=tools/clang \
            file://0003-clang-Driver-tools.cpp-Add-lssp-and-lssp_nonshared-o.patch;patchdir=tools/clang \
@@ -86,7 +86,7 @@ EXTRA_OEMAKE += "REQUIRES_RTTI=1 VERBOSE=1"
 DEPENDS = "zlib libffi libxml2 binutils"
 DEPENDS_remove_class-nativesdk = "nativesdk-binutils"
 DEPENDS_append_class-nativesdk = " clang-native "
-DEPENDS_append_class-target = " clang-native "
+DEPENDS_append_class-target = " clang-cross-${TARGET_ARCH} "
 
 do_configure_prepend() {
         # Remove RPATHs