llvmPackages_17: drop

- GCC 9, 10, 11, and 12 have been removed, as they have reached end‐of‐life upstream and are no longer supported.

- LLVM 12, 13, 14, 15, and 16 have been removed, as they have reached end‐of‐life upstream and are no longer supported.

- LLVM 12, 13, 14, 15, 16, and 17 have been removed, as they have reached end‐of‐life upstream and are no longer supported.

- GHCJS 8.10, exposed via `haskell.compiler.ghcjs` and `haskell.compiler.ghcjs810`, has been removed. Downstream users should migrate their projects to the new JavaScript backend of GHC proper which can be used via `pkgsCross.ghcjs` from Nixpkgs. Haskell packaging code, like `haskellPackages.mkDerivation`, `ghcWithPackages` and `hoogleWithPackages`, also no longer supports GHCJS.

diff --git a/include/clang/Basic/TokenKinds.def b/include/clang/Basic/TokenKinds.def

index ef0dad0f2..afd101b00 100644

--- a/include/clang/Basic/TokenKinds.def

+++ b/include/clang/Basic/TokenKinds.def

@@ -753,7 +753,7 @@ KEYWORD(__builtin_sycl_unique_stable_name, KEYSYCL)

 // Keywords defined by Attr.td.

 #ifndef KEYWORD_ATTRIBUTE

-#define KEYWORD_ATTRIBUTE(X) KEYWORD(X, KEYALL)

+#define KEYWORD_ATTRIBUTE(X, EMPTY) KEYWORD(EMPTY ## X, KEYALL)

 #endif

 #include "clang/Basic/AttrTokenKinds.inc"

diff --git a/include/clang/Basic/TokenKinds.h b/include/clang/Basic/TokenKinds.h

index e4857405b..ff117bd5a 100644

--- a/include/clang/Basic/TokenKinds.h

+++ b/include/clang/Basic/TokenKinds.h

@@ -109,7 +109,7 @@ bool isPragmaAnnotation(TokenKind K);

 inline constexpr bool isRegularKeywordAttribute(TokenKind K) {

   return (false

-#define KEYWORD_ATTRIBUTE(X) || (K == tok::kw_##X)

+#define KEYWORD_ATTRIBUTE(X, ...) || (K == tok::kw_##X)

 #include "clang/Basic/AttrTokenKinds.inc"

   );

 }

diff --git a/utils/TableGen/ClangAttrEmitter.cpp b/utils/TableGen/ClangAttrEmitter.cpp

index b5813c6ab..79db17501 100644

--- a/utils/TableGen/ClangAttrEmitter.cpp

+++ b/utils/TableGen/ClangAttrEmitter.cpp

@@ -3430,7 +3430,7 @@ void EmitClangAttrTokenKinds(RecordKeeper &Records, raw_ostream &OS) {

                      "RegularKeyword attributes with arguments are not "

                      "yet supported");

         OS << "KEYWORD_ATTRIBUTE("

-           << S.getSpellingRecord().getValueAsString("Name") << ")\n";

+           << S.getSpellingRecord().getValueAsString("Name") << ", )\n";

       }

   OS << "#undef KEYWORD_ATTRIBUTE\n";

 }

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

index f7936d72e088..a362fa49b534 100644

--- a/CMakeLists.txt

+++ b/CMakeLists.txt

@@ -31,7 +31,21 @@ if(CLANG_BUILT_STANDALONE)

   find_package(LLVM REQUIRED HINTS "${LLVM_CMAKE_DIR}")

   list(APPEND CMAKE_MODULE_PATH "${LLVM_DIR}")

-  # Turn into CACHE PATHs for overwritting

+  # We can't check LLVM_CONFIG here, because find_package(LLVM ...) also sets

+  # LLVM_CONFIG.

+  if (NOT LLVM_CONFIG_FOUND)

+    # Pull values from LLVMConfig.cmake.  We can drop this once the llvm-config

+    # path is removed.

+    set(INCLUDE_DIRS ${LLVM_INCLUDE_DIRS})

+    set(LLVM_OBJ_DIR "${LLVM_BINARY_DIR}")

+    # N.B. this is just a default value, the CACHE PATHs below can be overriden.

+    set(MAIN_SRC_DIR "${CMAKE_CURRENT_SOURCE_DIR}/../llvm")

+    set(TOOLS_BINARY_DIR "${LLVM_TOOLS_BINARY_DIR}")

+    set(LIBRARY_DIR "${LLVM_LIBRARY_DIR}")

+  else()

+    set(INCLUDE_DIRS "${LLVM_BINARY_DIR}/include" "${MAIN_INCLUDE_DIR}")

+  endif()

+

   set(LLVM_INCLUDE_DIRS ${LLVM_INCLUDE_DIRS} CACHE PATH "Path to llvm/include and any other header dirs needed")

   set(LLVM_BINARY_DIR "${LLVM_BINARY_DIR}" CACHE PATH "Path to LLVM build tree")

   set(LLVM_MAIN_SRC_DIR "${CMAKE_CURRENT_SOURCE_DIR}/../llvm" CACHE PATH "Path to LLVM source tree")

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

index 75b0080f6715..c895b884cd27 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 f2b0c5cddcbb..52f37fc368ce 100644

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

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

@@ -473,6 +473,7 @@ add_header_target("windows-resource-headers" ${windows_only_files})

 add_header_target("utility-resource-headers" ${utility_files})

 get_clang_resource_dir(header_install_dir SUBDIR include)

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

 #############################################################

 # Install rules for the catch-all clang-resource-headers target

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

index 4f23065a2472..6a0f55991e24 100644

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

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

@@ -234,7 +234,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 3aca22c0b0a8..3115353e3fe3 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 | 7 -------

 1 file changed, 7 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

@@ -487,13 +487,7 @@ void tools::gnutools::Linker::ConstructJob(Compilation &C, const JobAction &JA,

   } else {

     if (Args.hasArg(options::OPT_rdynamic))

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

-    if (!Args.hasArg(options::OPT_shared) && !IsStaticPIE &&

-        !Args.hasArg(options::OPT_r)) {

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

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

-                                           ToolChain.getDynamicLinker(Args)));

-    }

   }

   CmdArgs.push_back("-o");

-- 

2.11.0

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() {