diff options
| -rw-r--r-- | host/include/llvm/Config/config.h | 4 | ||||
| -rw-r--r-- | include/llvm/Analysis/TargetLibraryInfo.h | 15 | ||||
| -rw-r--r-- | lib/Support/DynamicLibrary.cpp | 2 | ||||
| -rw-r--r-- | soong/llvm.go | 4 |
4 files changed, 3 insertions, 22 deletions
diff --git a/host/include/llvm/Config/config.h b/host/include/llvm/Config/config.h index ce0c15d9184f..eb6c81d1ec1d 100644 --- a/host/include/llvm/Config/config.h +++ b/host/include/llvm/Config/config.h @@ -115,7 +115,7 @@ #define HAVE_ERROR_T 1 /* Define to 1 if you have the <execinfo.h> header file. */ -#if !defined(__BIONIC__) && !defined(ANDROID_HOST_MUSL) +#ifndef __BIONIC__ #define HAVE_EXECINFO_H 1 #endif @@ -247,7 +247,7 @@ /* #undef HAVE_MACH_O_DYLD_H */ /* Define if mallinfo() is available on this platform. */ -#if !defined(__APPLE__) && !defined(ANDROID_HOST_MUSL) +#if !defined(__APPLE__) #define HAVE_MALLINFO 1 #else /* #undef HAVE_MALLINFO */ diff --git a/include/llvm/Analysis/TargetLibraryInfo.h b/include/llvm/Analysis/TargetLibraryInfo.h index 48cbd9b640eb..02203126f05e 100644 --- a/include/llvm/Analysis/TargetLibraryInfo.h +++ b/include/llvm/Analysis/TargetLibraryInfo.h @@ -27,21 +27,6 @@ #undef ftello #endif #endif // _WIN32 - -#ifdef ANDROID_HOST_MUSL -# ifdef fopen64 -# undef fopen64 -# endif -# ifdef fseeko64 -# undef fseeko64 -# endif -# ifdef ftello64 -# undef ftello64 -# endif -# ifdef tmpfile64 -# undef tmpfile64 -# endif -#endif // END ANDROID-SPECIFIC namespace llvm { diff --git a/lib/Support/DynamicLibrary.cpp b/lib/Support/DynamicLibrary.cpp index 3fdea209151b..9a7aeb50a216 100644 --- a/lib/Support/DynamicLibrary.cpp +++ b/lib/Support/DynamicLibrary.cpp @@ -143,7 +143,7 @@ void* DynamicLibrary::SearchForAddressOfSymbol(const char *symbolName) { // On linux we have a weird situation. The stderr/out/in symbols are both // macros and global variables because of standards requirements. So, we // boldly use the EXPLICIT_SYMBOL macro without checking for a #define first. -#if defined(__linux__) and !defined(__ANDROID__) && !defined(ANDROID_HOST_MUSL) +#if defined(__linux__) and !defined(__ANDROID__) { EXPLICIT_SYMBOL(stderr); EXPLICIT_SYMBOL(stdout); diff --git a/soong/llvm.go b/soong/llvm.go index 6a38fb56aec8..edbc9cb95d5c 100644 --- a/soong/llvm.go +++ b/soong/llvm.go @@ -89,9 +89,6 @@ func forceBuildLlvmComponents(ctx android.LoadHookContext) { if !forceBuild { type props struct { Target struct { - Darwin_arm64 struct { - Enabled *bool - } Host struct { Enabled *bool } @@ -101,7 +98,6 @@ func forceBuildLlvmComponents(ctx android.LoadHookContext) { } } p := &props{} - p.Target.Darwin_arm64.Enabled = proptools.BoolPtr(true) p.Target.Host.Enabled = proptools.BoolPtr(false) p.Target.Linux_bionic_arm64.Enabled = proptools.BoolPtr(true) ctx.AppendProperties(p) |