Merge pull request #329305 from ExpidusOS/feat/llvm-19

diff --git a/cmake/modules/AddClang.cmake b/cmake/modules/AddClang.cmake

index 75b0080f6..c895b884c 100644

--- a/cmake/modules/AddClang.cmake

+++ b/cmake/modules/AddClang.cmake

@@ -119,8 +119,8 @@ macro(add_clang_library name)

         install(TARGETS ${lib}

           COMPONENT ${lib}

           ${export_to_clangtargets}

-          LIBRARY DESTINATION lib${LLVM_LIBDIR_SUFFIX}

-          ARCHIVE DESTINATION lib${LLVM_LIBDIR_SUFFIX}

+          LIBRARY DESTINATION "${CMAKE_INSTALL_LIBDIR}${LLVM_LIBDIR_SUFFIX}"

+          ARCHIVE DESTINATION "${CMAKE_INSTALL_LIBDIR}${LLVM_LIBDIR_SUFFIX}"

           RUNTIME DESTINATION "${CMAKE_INSTALL_BINDIR}")

         if (NOT LLVM_ENABLE_IDE)

diff --git a/lib/Headers/CMakeLists.txt b/lib/Headers/CMakeLists.txt

index e6ae4e19e..5ef01aea2 100644

--- a/lib/Headers/CMakeLists.txt

+++ b/lib/Headers/CMakeLists.txt

@@ -337,6 +337,7 @@ set(llvm_libc_wrapper_files

 include(GetClangResourceDir)

 get_clang_resource_dir(output_dir PREFIX ${LLVM_LIBRARY_OUTPUT_INTDIR}/.. SUBDIR include)

+set(header_install_dir ${CMAKE_INSTALL_LIBDIR}${LLVM_LIBDIR_SUFFIX}/clang/${CLANG_VERSION_MAJOR}/include)

 set(out_files)

 set(generated_files)

diff --git a/tools/libclang/CMakeLists.txt b/tools/libclang/CMakeLists.txt

index b5b6d2807..6b592d255 100644

--- a/tools/libclang/CMakeLists.txt

+++ b/tools/libclang/CMakeLists.txt

@@ -246,7 +246,7 @@ foreach(PythonVersion ${CLANG_PYTHON_BINDINGS_VERSIONS})

           COMPONENT

             libclang-python-bindings

           DESTINATION

-            "lib${LLVM_LIBDIR_SUFFIX}/python${PythonVersion}/site-packages")

+            "${CMAKE_INSTALL_LIBDIR}${LLVM_LIBDIR_SUFFIX}/python${PythonVersion}/site-packages")

 endforeach()

 if(NOT LLVM_ENABLE_IDE)

   add_custom_target(libclang-python-bindings)

diff --git a/tools/scan-build-py/CMakeLists.txt b/tools/scan-build-py/CMakeLists.txt

index 3aca22c0b..3115353e3 100644

--- a/tools/scan-build-py/CMakeLists.txt

+++ b/tools/scan-build-py/CMakeLists.txt

@@ -88,7 +88,7 @@ foreach(lib ${LibScanbuild})

                      DEPENDS ${CMAKE_CURRENT_SOURCE_DIR}/lib/libscanbuild/${lib})

   list(APPEND Depends ${CMAKE_BINARY_DIR}/lib/libscanbuild/${lib})

   install(FILES lib/libscanbuild/${lib}

-          DESTINATION lib${CLANG_LIBDIR_SUFFIX}/libscanbuild

+          DESTINATION "${CMAKE_INSTALL_LIBDIR}/libscanbuild"

           COMPONENT scan-build-py)

 endforeach()

@@ -106,7 +106,7 @@ foreach(resource ${LibScanbuildResources})

                      DEPENDS ${CMAKE_CURRENT_SOURCE_DIR}/lib/libscanbuild/resources/${resource})

   list(APPEND Depends ${CMAKE_BINARY_DIR}/lib/libscanbuild/resources/${resource})

   install(FILES lib/libscanbuild/resources/${resource}

-          DESTINATION lib${CLANG_LIBDIR_SUFFIX}/libscanbuild/resources

+          DESTINATION "${CMAKE_INSTALL_LIBDIR}/libscanbuild/resources"

           COMPONENT scan-build-py)

 endforeach()

@@ -122,7 +122,7 @@ foreach(lib ${LibEar})

                      DEPENDS ${CMAKE_CURRENT_SOURCE_DIR}/lib/libear/${lib})

   list(APPEND Depends ${CMAKE_BINARY_DIR}/lib/libear/${lib})

   install(FILES lib/libear/${lib}

-          DESTINATION lib${CLANG_LIBDIR_SUFFIX}/libear

+          DESTINATION "${CMAKE_INSTALL_LIBDIR}/libear"

           COMPONENT scan-build-py)

 endforeach()

From 4add81bba40dcec62c4ea4481be8e35ac53e89d8 Mon Sep 17 00:00:00 2001

From: Will Dietz <w@wdtz.org>

Date: Thu, 18 May 2017 11:56:12 -0500

Subject: [PATCH] "purity" patch for 5.0

---

 lib/Driver/ToolChains/Gnu.cpp | 3 ---

 1 file changed, 3 deletions(-)

diff --git a/lib/Driver/ToolChains/Gnu.cpp b/lib/Driver/ToolChains/Gnu.cpp

index fe3c0191bb..c6a482bece 100644

--- a/lib/Driver/ToolChains/Gnu.cpp

+++ b/lib/Driver/ToolChains/Gnu.cpp

@@ -446,9 +446,6 @@ void tools::gnutools::Linker::ConstructJob(Compilation &C, const JobAction &JA,

                            ToolChain.isPIEDefault(Args));

       if (IsPIE)

         CmdArgs.push_back("-pie");

-      CmdArgs.push_back("-dynamic-linker");

-      CmdArgs.push_back(Args.MakeArgString(Twine(D.DyldPrefix) +

-                                           ToolChain.getDynamicLinker(Args)));

     }

   }

-- 

2.11.0

diff --git a/lib/builtins/CMakeLists.txt b/lib/builtins/CMakeLists.txt

index 3a66dd9c3fb..7efc85d9f9f 100644

--- a/lib/builtins/CMakeLists.txt

+++ b/lib/builtins/CMakeLists.txt

@@ -348,4 +348,8 @@ if (NOT MSVC)

+  set(i486_SOURCES ${i386_SOURCES})

+  set(i586_SOURCES ${i386_SOURCES})

+  set(i686_SOURCES ${i386_SOURCES})

+

   if (WIN32)

     set(i386_SOURCES

       ${i386_SOURCES}

@@ -723,6 +723,7 @@ else ()

   endif()

   foreach (arch ${BUILTIN_SUPPORTED_ARCH})

+      message("arch: ${arch}")

     if (CAN_TARGET_${arch})

       # For ARM archs, exclude any VFP builtins if VFP is not supported

       if (${arch} MATCHES "^(arm|armhf|armv7|armv7s|armv7k|armv7m|armv7em)$")

diff --git a/lib/sanitizer_common/sanitizer_mac.cpp b/lib/sanitizer_common/sanitizer_mac.cpp

--- a/lib/sanitizer_common/sanitizer_mac.cpp

+++ b/lib/sanitizer_common/sanitizer_mac.cpp

@@ -613,9 +613,15 @@ HandleSignalMode GetHandleSignalMode(int signum) {

 // Offset example:

 // XNU 17 -- macOS 10.13 -- iOS 11 -- tvOS 11 -- watchOS 4

 constexpr u16 GetOSMajorKernelOffset() {

-  if (TARGET_OS_OSX) return 4;

-  if (TARGET_OS_IOS || TARGET_OS_TV) return 6;

-  if (TARGET_OS_WATCH) return 13;

+#if TARGET_OS_OSX

+  return 4;

+#endif

+#if TARGET_OS_IOS || TARGET_OS_TV

+  return 6;

+#endif

+#if TARGET_OS_WATCH

+  return 13;

+#endif

 }

 using VersStr = char[64];

@@ -627,13 +633,13 @@ static uptr ApproximateOSVersionViaKernelVersion(VersStr vers) {

   u16 os_major = kernel_major - offset;

   const char *format = "%d.0";

-  if (TARGET_OS_OSX) {

-    if (os_major >= 16) {  // macOS 11+

-      os_major -= 5;

-    } else {  // macOS 10.15 and below

-      format = "10.%d";

-    }

+#if TARGET_OS_OSX

+  if (os_major >= 16) {  // macOS 11+

+    os_major -= 5;

+  } else {  // macOS 10.15 and below

+    format = "10.%d";

   }

+#endif

   return internal_snprintf(vers, sizeof(VersStr), format, os_major);

 }

@@ -681,15 +687,14 @@ void ParseVersion(const char *vers, u16 *major, u16 *minor) {

 // Aligned versions example:

 // macOS 10.15 -- iOS 13 -- tvOS 13 -- watchOS 6

 static void MapToMacos(u16 *major, u16 *minor) {

-  if (TARGET_OS_OSX)

-    return;

-

-  if (TARGET_OS_IOS || TARGET_OS_TV)

+#if !TARGET_OS_OSX

+#if TARGET_OS_IOS || TARGET_OS_TV

     *major += 2;

-  else if (TARGET_OS_WATCH)

+#elif TARGET_OS_WATCH

     *major += 9;

-  else

+#else

     UNREACHABLE("unsupported platform");

+#endif

   if (*major >= 16) {  // macOS 11+

     *major -= 5;

@@ -697,6 +702,7 @@ static void MapToMacos(u16 *major, u16 *minor) {

     *minor = *major;

     *major = 10;

   }

+#endif

 }

 static MacosVersion GetMacosAlignedVersionInternal() {

diff --git a/cmake/Modules/CompilerRTUtils.cmake b/cmake/Modules/CompilerRTUtils.cmake

index 4c85551d7766..297d7a47c54b 100644

--- a/cmake/Modules/CompilerRTUtils.cmake

+++ b/cmake/Modules/CompilerRTUtils.cmake

@@ -328,8 +328,9 @@ macro(load_llvm_config)

     endif()

   endif()

-  set(LLVM_LIBRARY_OUTPUT_INTDIR

-    ${LLVM_BINARY_DIR}/${CMAKE_CFG_INTDIR}/lib${LLVM_LIBDIR_SUFFIX})

+  get_filename_component(LLVM_LIBRARY_OUTPUT_INTDIR

+    ${LLVM_BINARY_DIR}/${CMAKE_CFG_INTDIR}/lib${LLVM_LIBDIR_SUFFIX}

+    REALPATH)

   set(LLVM_MAIN_SRC_DIR "${LLVM_MAIN_SRC_DIR_DEFAULT}" CACHE PATH "Path to LLVM source tree")

   message(STATUS "LLVM_MAIN_SRC_DIR: \"${LLVM_MAIN_SRC_DIR}\"")