llvmPackages_13: 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 has been removed, as it has reached end‐of‐life upstream and is no longer supported.

- LLVM 12 and 13 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/CMakeLists.txt b/CMakeLists.txt

index 9e74014134a0..976e6a1757fd 100644

--- a/CMakeLists.txt

+++ b/CMakeLists.txt

@@ -5,6 +5,8 @@ cmake_minimum_required(VERSION 3.13.4)

 if( CMAKE_SOURCE_DIR STREQUAL CMAKE_CURRENT_SOURCE_DIR )

   project(Clang)

+  include(GNUInstallDirs)

+

   set(CMAKE_CXX_STANDARD 14 CACHE STRING "C++ standard to conform to")

   set(CMAKE_CXX_STANDARD_REQUIRED YES)

   set(CMAKE_CXX_EXTENSIONS NO)

@@ -416,7 +418,7 @@ include_directories(BEFORE

 if (NOT LLVM_INSTALL_TOOLCHAIN_ONLY)

   install(DIRECTORY include/clang include/clang-c

-    DESTINATION include

+    DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}

     COMPONENT clang-headers

     FILES_MATCHING

     PATTERN "*.def"

@@ -425,7 +427,7 @@ if (NOT LLVM_INSTALL_TOOLCHAIN_ONLY)

     )

   install(DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/include/clang

-    DESTINATION include

+    DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}

     COMPONENT clang-headers

     FILES_MATCHING

     PATTERN "CMakeFiles" EXCLUDE

@@ -445,7 +447,7 @@ if (NOT LLVM_INSTALL_TOOLCHAIN_ONLY)

   add_custom_target(bash-autocomplete DEPENDS utils/bash-autocomplete.sh)

   install(PROGRAMS utils/bash-autocomplete.sh

-          DESTINATION share/clang

+          DESTINATION ${CMAKE_INSTALL_DATADIR}/clang

           COMPONENT bash-autocomplete)

   if(NOT LLVM_ENABLE_IDE)

     add_llvm_install_targets(install-bash-autocomplete

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

index 704278a0e93b..d25c8d325c71 100644

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

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

@@ -123,9 +123,9 @@ 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}

-          RUNTIME DESTINATION bin)

+          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)

           add_llvm_install_targets(install-${lib}

@@ -170,7 +170,7 @@ macro(add_clang_tool name)

     install(TARGETS ${name}

       ${export_to_clangtargets}

-      RUNTIME DESTINATION bin

+      RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR}

       COMPONENT ${name})

     if(NOT LLVM_ENABLE_IDE)

@@ -185,7 +185,7 @@ endmacro()

 macro(add_clang_symlink name dest)

   add_llvm_tool_symlink(${name} ${dest} ALWAYS_GENERATE)

   # Always generate install targets

-  llvm_install_symlink(${name} ${dest} ALWAYS_GENERATE)

+  llvm_install_symlink(${name} ${dest} ${CMAKE_INSTALL_FULL_BINDIR} ALWAYS_GENERATE)

 endmacro()

 function(clang_target_link_libraries target type)

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

index b2c0ce8dd4a0..19e5443d8c25 100644

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

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

@@ -215,7 +215,7 @@ set_target_properties(clang-resource-headers PROPERTIES

   FOLDER "Misc"

   RUNTIME_OUTPUT_DIRECTORY "${output_dir}")

-set(header_install_dir lib${LLVM_LIBDIR_SUFFIX}/clang/${CLANG_VERSION}/include)

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

 install(

   FILES ${files} ${generated_files}

diff --git a/tools/c-index-test/CMakeLists.txt b/tools/c-index-test/CMakeLists.txt

index ceef4b08637c..8efad5520ca4 100644

--- a/tools/c-index-test/CMakeLists.txt

+++ b/tools/c-index-test/CMakeLists.txt

@@ -54,7 +54,7 @@ if (NOT LLVM_INSTALL_TOOLCHAIN_ONLY)

     set_property(TARGET c-index-test APPEND PROPERTY INSTALL_RPATH

        "@executable_path/../../lib")

   else()

-    set(INSTALL_DESTINATION bin)

+    set(INSTALL_DESTINATION ${CMAKE_INSTALL_BINDIR})

   endif()

   install(TARGETS c-index-test

diff --git a/tools/clang-format/CMakeLists.txt b/tools/clang-format/CMakeLists.txt

index 35ecdb11253c..d77d75de0094 100644

--- a/tools/clang-format/CMakeLists.txt

+++ b/tools/clang-format/CMakeLists.txt

@@ -21,20 +21,20 @@ if( LLVM_LIB_FUZZING_ENGINE OR LLVM_USE_SANITIZE_COVERAGE )

 endif()

 install(PROGRAMS clang-format-bbedit.applescript

-  DESTINATION share/clang

+  DESTINATION ${CMAKE_INSTALL_DATADIR}/clang

   COMPONENT clang-format)

 install(PROGRAMS clang-format-diff.py

-  DESTINATION share/clang

+  DESTINATION ${CMAKE_INSTALL_DATADIR}/clang

   COMPONENT clang-format)

 install(PROGRAMS clang-format-sublime.py

-  DESTINATION share/clang

+  DESTINATION ${CMAKE_INSTALL_DATADIR}/clang

   COMPONENT clang-format)

 install(PROGRAMS clang-format.el

-  DESTINATION share/clang

+  DESTINATION ${CMAKE_INSTALL_DATADIR}/clang

   COMPONENT clang-format)

 install(PROGRAMS clang-format.py

-  DESTINATION share/clang

+  DESTINATION ${CMAKE_INSTALL_DATADIR}/clang

   COMPONENT clang-format)

 install(PROGRAMS git-clang-format

-  DESTINATION bin

+  DESTINATION ${CMAKE_INSTALL_BINDIR}

   COMPONENT clang-format)

diff --git a/tools/clang-rename/CMakeLists.txt b/tools/clang-rename/CMakeLists.txt

index cda8e29ec5b1..0134d8ccd70b 100644

--- a/tools/clang-rename/CMakeLists.txt

+++ b/tools/clang-rename/CMakeLists.txt

@@ -19,8 +19,8 @@ clang_target_link_libraries(clang-rename

   )

 install(PROGRAMS clang-rename.py

-  DESTINATION share/clang

+  DESTINATION ${CMAKE_INSTALL_DATADIR}/clang

   COMPONENT clang-rename)

 install(PROGRAMS clang-rename.el

-  DESTINATION share/clang

+  DESTINATION ${CMAKE_INSTALL_DATADIR}/clang

   COMPONENT clang-rename)

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

index 51ff2e7e1565..1ed5f8a079a1 100644

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

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

@@ -166,7 +166,7 @@ endif()

 if(INTERNAL_INSTALL_PREFIX)

   set(LIBCLANG_HEADERS_INSTALL_DESTINATION "${INTERNAL_INSTALL_PREFIX}/include")

 else()

-  set(LIBCLANG_HEADERS_INSTALL_DESTINATION include)

+  set(LIBCLANG_HEADERS_INSTALL_DESTINATION ${CMAKE_INSTALL_INCLUDEDIR})

 endif()

 install(DIRECTORY ../../include/clang-c

@@ -196,7 +196,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/CMakeLists.txt b/tools/scan-build/CMakeLists.txt

index ec0702d76f18..d25d982f51da 100644

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

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

@@ -47,7 +47,7 @@ if(CLANG_INSTALL_SCANBUILD)

                        DEPENDS ${CMAKE_CURRENT_SOURCE_DIR}/bin/${BinFile})

     list(APPEND Depends ${CMAKE_BINARY_DIR}/bin/${BinFile})

     install(PROGRAMS bin/${BinFile}

-            DESTINATION bin

+            DESTINATION ${CMAKE_INSTALL_BINDIR}

             COMPONENT scan-build)

   endforeach()

@@ -61,7 +61,7 @@ if(CLANG_INSTALL_SCANBUILD)

                        DEPENDS ${CMAKE_CURRENT_SOURCE_DIR}/libexec/${LibexecFile})

     list(APPEND Depends ${CMAKE_BINARY_DIR}/libexec/${LibexecFile})

     install(PROGRAMS libexec/${LibexecFile}

-            DESTINATION libexec

+            DESTINATION ${CMAKE_INSTALL_LIBEXECDIR}

             COMPONENT scan-build)

   endforeach()

@@ -89,7 +89,7 @@ if(CLANG_INSTALL_SCANBUILD)

                        DEPENDS ${CMAKE_CURRENT_SOURCE_DIR}/share/scan-build/${ShareFile})

     list(APPEND Depends ${CMAKE_BINARY_DIR}/share/scan-build/${ShareFile})

     install(FILES share/scan-build/${ShareFile}

-            DESTINATION share/scan-build

+            DESTINATION ${CMAKE_INSTALL_DATADIR}/scan-build

             COMPONENT scan-build)

   endforeach()

diff --git a/tools/scan-view/CMakeLists.txt b/tools/scan-view/CMakeLists.txt

index dd3d33439299..fea19c12ce70 100644

--- a/tools/scan-view/CMakeLists.txt

+++ b/tools/scan-view/CMakeLists.txt

@@ -19,7 +19,7 @@ if(CLANG_INSTALL_SCANVIEW)

                        DEPENDS ${CMAKE_CURRENT_SOURCE_DIR}/bin/${BinFile})

     list(APPEND Depends ${CMAKE_BINARY_DIR}/bin/${BinFile})

     install(PROGRAMS bin/${BinFile}

-            DESTINATION bin

+            DESTINATION ${CMAKE_INSTALL_BINDIR}

             COMPONENT scan-view)

   endforeach()

@@ -33,7 +33,7 @@ if(CLANG_INSTALL_SCANVIEW)

                        DEPENDS ${CMAKE_CURRENT_SOURCE_DIR}/share/${ShareFile})

     list(APPEND Depends ${CMAKE_BINARY_DIR}/share/scan-view/${ShareFile})

     install(FILES share/${ShareFile}

-            DESTINATION share/scan-view

+            DESTINATION ${CMAKE_INSTALL_DATADIR}/scan-view

             COMPONENT scan-view)

   endforeach()

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

index 62f2de0cb15c..6aa66825b6ec 100644

--- a/utils/hmaptool/CMakeLists.txt

+++ b/utils/hmaptool/CMakeLists.txt

@@ -10,7 +10,7 @@ add_custom_command(OUTPUT ${CMAKE_BINARY_DIR}/${CMAKE_CFG_INTDIR}/bin/${CLANG_HM

 list(APPEND Depends ${CMAKE_BINARY_DIR}/${CMAKE_CFG_INTDIR}/bin/${CLANG_HMAPTOOL})

 install(PROGRAMS ${CLANG_HMAPTOOL}

-        DESTINATION bin

+        DESTINATION ${CMAKE_INSTALL_BINDIR}

         COMPONENT hmaptool)

 add_custom_target(hmaptool ALL DEPENDS ${Depends})

--- b/include/clang/Basic/TargetInfo.h

+++ a/include/clang/Basic/TargetInfo.h

@@ -612,8 +612,8 @@

   }

   /// Return the largest alignment for which a suitably-sized allocation with

+  /// '::operator new(size_t)' is guaranteed to produce a correctly-aligned

+  /// pointer.

-  /// '::operator new(size_t)' or 'malloc' is guaranteed to produce a

-  /// correctly-aligned pointer.

   unsigned getNewAlign() const {

     return NewAlign ? NewAlign : std::max(LongDoubleAlign, LongLongAlign);

   }

--- b/lib/CodeGen/CGCall.cpp

+++ a/lib/CodeGen/CGCall.cpp

@@ -2048,24 +2048,6 @@

       // allows it to work on indirect virtual function calls.

       if (AttrOnCallSite && TargetDecl->hasAttr<NoMergeAttr>())

         FuncAttrs.addAttribute(llvm::Attribute::NoMerge);

-

-      // Add known guaranteed alignment for allocation functions.

-      if (unsigned BuiltinID = Fn->getBuiltinID()) {

-        switch (BuiltinID) {

-        case Builtin::BIaligned_alloc:

-        case Builtin::BIcalloc:

-        case Builtin::BImalloc:

-        case Builtin::BImemalign:

-        case Builtin::BIrealloc:

-        case Builtin::BIstrdup:

-        case Builtin::BIstrndup:

-          RetAttrs.addAlignmentAttr(Context.getTargetInfo().getNewAlign() /

-                                    Context.getTargetInfo().getCharWidth());

-          break;

-        default:

-          break;

-        }

-      }

     }

     // 'const', 'pure' and 'noalias' attributed functions are also nounwind.

--- b/test/CodeGen/alloc-fns-alignment.c

+++ /dev/null

@@ -1,35 +0,0 @@

-// RUN: %clang_cc1 -triple x86_64-unknown-linux-gnu -emit-llvm < %s | FileCheck %s --check-prefix=ALIGN16

-// RUN: %clang_cc1 -triple x86_64-windows-msvc      -emit-llvm < %s | FileCheck %s --check-prefix=ALIGN16

-// RUN: %clang_cc1 -triple i386-apple-darwin        -emit-llvm < %s | FileCheck %s --check-prefix=ALIGN16

-// RUN: %clang_cc1 -triple i386-unknown-linux-gnu   -emit-llvm < %s | FileCheck %s --check-prefix=ALIGN8

-// RUN: %clang_cc1 -triple x86_64-unknown-linux-gnu -fno-builtin-malloc  -emit-llvm < %s  | FileCheck %s --check-prefix=NOBUILTIN-MALLOC

-// RUN: %clang_cc1 -triple x86_64-unknown-linux-gnu -fno-builtin-calloc  -emit-llvm < %s  | FileCheck %s --check-prefix=NOBUILTIN-CALLOC

-// RUN: %clang_cc1 -triple x86_64-unknown-linux-gnu -fno-builtin-realloc -emit-llvm < %s  | FileCheck %s --check-prefix=NOBUILTIN-REALLOC

-

-typedef __SIZE_TYPE__ size_t;

-

-void *malloc(size_t);

-void *calloc(size_t, size_t);

-void *realloc(void *, size_t);

-

-void *malloc_test(size_t n) {

-  return malloc(n);

-}

-

-void *calloc_test(size_t n) {

-  return calloc(1, n);

-}

-

-void *raalloc_test(void *p, size_t n) {

-  return realloc(p, n);

-}

-

-// ALIGN16: align 16 i8* @malloc

-// ALIGN16: align 16 i8* @calloc

-// ALIGN16: align 16 i8* @realloc

-// ALIGN8: align 8 i8* @malloc

-// ALIGN8: align 8 i8* @calloc

-// ALIGN8: align 8 i8* @realloc

-// NOBUILTIN-MALLOC: declare i8* @malloc

-// NOBUILTIN-CALLOC: declare i8* @calloc

-// NOBUILTIN-REALLOC: declare i8* @realloc

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

index b44ad2c2118e..d42f5664d448 100644

--- a/CMakeLists.txt

+++ b/CMakeLists.txt

@@ -8,6 +8,7 @@ cmake_minimum_required(VERSION 3.13.4)

 # Check if compiler-rt is built as a standalone project.

 if (CMAKE_SOURCE_DIR STREQUAL CMAKE_CURRENT_SOURCE_DIR OR COMPILER_RT_STANDALONE_BUILD)

   project(CompilerRT C CXX ASM)

+  include(GNUInstallDirs)

   set(COMPILER_RT_STANDALONE_BUILD TRUE)

   set_property(GLOBAL PROPERTY USE_FOLDERS ON)

 endif()

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

index 361538a58e47..f0d8d9ab80f1 100644

--- a/cmake/Modules/AddCompilerRT.cmake

+++ b/cmake/Modules/AddCompilerRT.cmake

@@ -495,7 +495,7 @@ macro(add_compiler_rt_resource_file target_name file_name component)

   add_custom_target(${target_name} DEPENDS ${dst_file})

   # Install in Clang resource directory.

   install(FILES ${file_name}

-    DESTINATION ${COMPILER_RT_INSTALL_PATH}/share

+    DESTINATION ${COMPILER_RT_INSTALL_PATH}/${CMAKE_INSTALL_FULL_DATADIR}

     COMPONENT ${component})

   add_dependencies(${component} ${target_name})

@@ -512,7 +512,7 @@ macro(add_compiler_rt_script name)

   add_custom_target(${name} DEPENDS ${dst})

   install(FILES ${dst}

     PERMISSIONS OWNER_READ OWNER_WRITE OWNER_EXECUTE GROUP_READ GROUP_EXECUTE WORLD_READ WORLD_EXECUTE

-    DESTINATION ${COMPILER_RT_INSTALL_PATH}/bin)

+    DESTINATION ${COMPILER_RT_INSTALL_PATH}/${CMAKE_INSTALL_FULL_BINDIR})

 endmacro(add_compiler_rt_script src name)

 # Builds custom version of libc++ and installs it in <prefix>.

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

index 456a8dcda59f..7a09e74c7c79 100644

--- a/cmake/Modules/CompilerRTDarwinUtils.cmake

+++ b/cmake/Modules/CompilerRTDarwinUtils.cmake

@@ -508,7 +508,7 @@ macro(darwin_add_embedded_builtin_libraries)

     set(DARWIN_macho_embedded_LIBRARY_OUTPUT_DIR

       ${COMPILER_RT_OUTPUT_DIR}/lib/macho_embedded)

     set(DARWIN_macho_embedded_LIBRARY_INSTALL_DIR

-      ${COMPILER_RT_INSTALL_PATH}/lib/macho_embedded)

+      ${COMPILER_RT_INSTALL_PATH}/${CMAKE_INSTALL_FULL_LIBDIR}/macho_embedded)

     set(CFLAGS_armv7 "-target thumbv7-apple-darwin-eabi")

     set(CFLAGS_i386 "-march=pentium")

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

index f61d487e93a0..f1f46fb9599c 100644

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

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

@@ -378,7 +378,7 @@ endfunction()

 function(get_compiler_rt_install_dir arch install_dir)

   if(LLVM_ENABLE_PER_TARGET_RUNTIME_DIR AND NOT APPLE)

     get_compiler_rt_target(${arch} target)

-    set(${install_dir} ${COMPILER_RT_INSTALL_PATH}/lib/${target} PARENT_SCOPE)

+    set(${install_dir} ${COMPILER_RT_INSTALL_PATH}/${CMAKE_INSTALL_FULL_LIBDIR}/${target} PARENT_SCOPE)

   else()

     set(${install_dir} ${COMPILER_RT_LIBRARY_INSTALL_DIR} PARENT_SCOPE)

   endif()

diff --git a/cmake/base-config-ix.cmake b/cmake/base-config-ix.cmake

index 1edab43e7c0d..1aac6b73ff82 100644

--- a/cmake/base-config-ix.cmake

+++ b/cmake/base-config-ix.cmake

@@ -65,11 +65,11 @@ if (LLVM_TREE_AVAILABLE)

 else()

     # Take output dir and install path from the user.

   set(COMPILER_RT_OUTPUT_DIR ${CMAKE_CURRENT_BINARY_DIR} CACHE PATH

-    "Path where built compiler-rt libraries should be stored.")

+    "Path where built compiler-rt build artifacts should be stored.")

   set(COMPILER_RT_EXEC_OUTPUT_DIR ${CMAKE_CURRENT_BINARY_DIR}/bin CACHE PATH

     "Path where built compiler-rt executables should be stored.")

-  set(COMPILER_RT_INSTALL_PATH ${CMAKE_INSTALL_PREFIX} CACHE PATH

-    "Path where built compiler-rt libraries should be installed.")

+  set(COMPILER_RT_INSTALL_PATH "" CACHE PATH

+    "Prefix where built compiler-rt artifacts should be installed, comes before CMAKE_INSTALL_PREFIX.")

   option(COMPILER_RT_INCLUDE_TESTS "Generate and build compiler-rt unit tests." OFF)

   option(COMPILER_RT_ENABLE_WERROR "Fail and stop if warning is triggered" OFF)

   # Use a host compiler to compile/link tests.

@@ -97,7 +97,7 @@ else(LLVM_ENABLE_PER_TARGET_RUNTIME_DIR)

   set(COMPILER_RT_LIBRARY_OUTPUT_DIR

     ${COMPILER_RT_OUTPUT_DIR}/lib/${COMPILER_RT_OS_DIR})

   set(COMPILER_RT_LIBRARY_INSTALL_DIR

-    ${COMPILER_RT_INSTALL_PATH}/lib/${COMPILER_RT_OS_DIR})

+    ${COMPILER_RT_INSTALL_PATH}/${CMAKE_INSTALL_FULL_LIBDIR}/${COMPILER_RT_OS_DIR})

 endif()

 if(APPLE)

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

index b00e8caa1ddd..0fe64e4862c9 100644

--- a/include/CMakeLists.txt

+++ b/include/CMakeLists.txt

@@ -69,22 +69,22 @@ set_target_properties(compiler-rt-headers PROPERTIES FOLDER "Compiler-RT Misc")

 install(FILES ${SANITIZER_HEADERS}

   COMPONENT compiler-rt-headers

   PERMISSIONS OWNER_READ OWNER_WRITE GROUP_READ WORLD_READ

-  DESTINATION ${COMPILER_RT_INSTALL_PATH}/include/sanitizer)

+  DESTINATION ${COMPILER_RT_INSTALL_PATH}/${CMAKE_INSTALL_FULL_INCLUDEDIR}/sanitizer)

 # Install fuzzer headers.

 install(FILES ${FUZZER_HEADERS}

   COMPONENT compiler-rt-headers

   PERMISSIONS OWNER_READ OWNER_WRITE GROUP_READ WORLD_READ

-  DESTINATION ${COMPILER_RT_INSTALL_PATH}/include/fuzzer)

+  DESTINATION ${COMPILER_RT_INSTALL_PATH}/${CMAKE_INSTALL_FULL_INCLUDEDIR}/fuzzer)

 # Install xray headers.

 install(FILES ${XRAY_HEADERS}

   COMPONENT compiler-rt-headers

   PERMISSIONS OWNER_READ OWNER_WRITE GROUP_READ WORLD_READ

-  DESTINATION ${COMPILER_RT_INSTALL_PATH}/include/xray)

+  DESTINATION ${COMPILER_RT_INSTALL_PATH}/${CMAKE_INSTALL_FULL_INCLUDEDIR}/xray)

 # Install profile headers.

 install(FILES ${PROFILE_HEADERS}

   COMPONENT compiler-rt-headers

   PERMISSIONS OWNER_READ OWNER_WRITE GROUP_READ WORLD_READ

-  DESTINATION ${COMPILER_RT_INSTALL_PATH}/include/profile)

+  DESTINATION ${COMPILER_RT_INSTALL_PATH}/${CMAKE_INSTALL_FULL_INCLUDEDIR}/profile)

 if (NOT CMAKE_CONFIGURATION_TYPES) # don't add this for IDEs.

   add_custom_target(install-compiler-rt-headers

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

index a29de8deff1b..d39ff01613d2 100644

--- a/lib/dfsan/CMakeLists.txt

+++ b/lib/dfsan/CMakeLists.txt

@@ -57,4 +57,4 @@ add_custom_command(OUTPUT ${dfsan_abilist_filename}

                    DEPENDS done_abilist.txt libc_ubuntu1404_abilist.txt)

 add_dependencies(dfsan dfsan_abilist)

 install(FILES ${dfsan_abilist_filename}

-        DESTINATION ${COMPILER_RT_INSTALL_PATH}/share)

+        DESTINATION ${COMPILER_RT_INSTALL_PATH}/${CMAKE_INSTALL_FULL_DATADIR})

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

index 81eddbc24879..e2afb2002150 100644

--- a/CMakeLists.txt

+++ b/CMakeLists.txt

@@ -23,6 +23,8 @@ set(LIBUNWIND_LIBCXX_PATH "${CMAKE_CURRENT_LIST_DIR}/../libcxx" CACHE PATH

 if (CMAKE_SOURCE_DIR STREQUAL CMAKE_CURRENT_SOURCE_DIR OR LIBUNWIND_STANDALONE_BUILD)

   project(libunwind LANGUAGES C CXX ASM)

+  include(GNUInstallDirs)

+

   set(PACKAGE_NAME libunwind)

   set(PACKAGE_VERSION 13.0.0git)

   set(PACKAGE_STRING "${PACKAGE_NAME} ${PACKAGE_VERSION}")

@@ -116,7 +118,7 @@ set(CMAKE_MODULE_PATH

 if(LLVM_ENABLE_PER_TARGET_RUNTIME_DIR AND NOT APPLE)

   set(LIBUNWIND_LIBRARY_DIR ${LLVM_LIBRARY_OUTPUT_INTDIR}/${LLVM_DEFAULT_TARGET_TRIPLE})

-  set(LIBUNWIND_INSTALL_LIBRARY_DIR lib${LLVM_LIBDIR_SUFFIX}/${LLVM_DEFAULT_TARGET_TRIPLE} CACHE PATH

+  set(LIBUNWIND_INSTALL_LIBRARY_DIR ${CMAKE_INSTALL_LIBDIR}${LLVM_LIBDIR_SUFFIX}/${LLVM_DEFAULT_TARGET_TRIPLE} CACHE PATH

       "Path where built libunwind libraries should be installed.")

   if(LIBCXX_LIBDIR_SUBDIR)

     string(APPEND LIBUNWIND_LIBRARY_DIR /${LIBUNWIND_LIBDIR_SUBDIR})

@@ -124,11 +126,11 @@ if(LLVM_ENABLE_PER_TARGET_RUNTIME_DIR AND NOT APPLE)

   endif()

 elseif(LLVM_LIBRARY_OUTPUT_INTDIR)

   set(LIBUNWIND_LIBRARY_DIR ${LLVM_LIBRARY_OUTPUT_INTDIR})

-  set(LIBUNWIND_INSTALL_LIBRARY_DIR lib${LIBUNWIND_LIBDIR_SUFFIX} CACHE PATH

+  set(LIBUNWIND_INSTALL_LIBRARY_DIR ${CMAKE_INSTALL_LIBDIR}${LLVM_LIBDIR_SUFFIX} CACHE PATH

       "Path where built libunwind libraries should be installed.")

 else()

   set(LIBUNWIND_LIBRARY_DIR ${CMAKE_BINARY_DIR}/lib${LIBUNWIND_LIBDIR_SUFFIX})

-  set(LIBUNWIND_INSTALL_LIBRARY_DIR lib${LIBUNWIND_LIBDIR_SUFFIX} CACHE PATH

+  set(LIBUNWIND_INSTALL_LIBRARY_DIR ${CMAKE_INSTALL_LIBDIR}${LLVM_LIBDIR_SUFFIX} CACHE PATH

       "Path where built libunwind libraries should be installed.")

 endif()