Unverified Commit 94574c75 authored by tomberek's avatar tomberek Committed by GitHub
Browse files

Merge pull request #333521 from ExpidusOS/feat/llvm-patch-common 

llvmPackages_{12,13,14,15,16,17,18,19,git}: commonify patches
parents 93517da2 77f6edfd

pkgs/development/compilers/llvm/13/clang/gnu-install-dirs.patch

deleted100644 → 0
+0 −235
Original line number Diff line number Diff line 
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})

pkgs/development/compilers/llvm/13/clang/purity.patch

deleted100644 → 0
+0 −28
Original line number Diff line number Diff line 
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,12 +487,6 @@ void tools::gnutools::Linker::ConstructJob(Compilation &C, const JobAction &JA,

   if (!IsStatic) {

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

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

-

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

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

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

-                                           ToolChain.getDynamicLinker(Args)));

-    }

   }

 

   CmdArgs.push_back("-o");

-- 

2.11.0

pkgs/development/compilers/llvm/13/compiler-rt/X86-support-extension.patch

deleted100644 → 0
+0 −21
Original line number Diff line number Diff line 
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

@@ -345,4 +345,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}

@@ -608,6 +612,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)$")

pkgs/development/compilers/llvm/13/compiler-rt/normalize-var.patch

deleted100644 → 0
+0 −16
Original line number Diff line number Diff line 
diff --git a/compiler-rt/cmake/Modules/CompilerRTUtils.cmake b/compiler-rt/cmake/Modules/CompilerRTUtils.cmake

index f1f46fb9599c..6f19e69507ba 100644

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

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

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

     # Get some LLVM variables from LLVMConfig.

     include("${LLVM_CMAKE_PATH}/LLVMConfig.cmake")

 

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

   endif()

 endmacro()

pkgs/development/compilers/llvm/13/lld/gnu-install-dirs.patch

deleted100644 → 0
+0 −68
Original line number Diff line number Diff line 
diff --git a/CMakeLists.txt b/CMakeLists.txt

index d4e561b50d8f..cfa5bdd79c2a 100644

--- a/CMakeLists.txt

+++ b/CMakeLists.txt

@@ -6,6 +6,8 @@ if(CMAKE_SOURCE_DIR STREQUAL CMAKE_CURRENT_SOURCE_DIR)

   set(CMAKE_INCLUDE_CURRENT_DIR ON)

   set(LLD_BUILT_STANDALONE TRUE)

 

+  include(GNUInstallDirs)

+

   find_program(LLVM_CONFIG_PATH "llvm-config" DOC "Path to llvm-config binary")

   if(NOT LLVM_CONFIG_PATH)

     message(FATAL_ERROR "llvm-config not found: specify LLVM_CONFIG_PATH")

@@ -179,7 +181,7 @@ include_directories(BEFORE

 

 if (NOT LLVM_INSTALL_TOOLCHAIN_ONLY)

   install(DIRECTORY include/

-    DESTINATION include

+    DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}

     FILES_MATCHING

     PATTERN "*.h"

     )

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

index 23df41312403..d62372c88de7 100644

--- a/cmake/modules/AddLLD.cmake

+++ b/cmake/modules/AddLLD.cmake

@@ -20,9 +20,9 @@ macro(add_lld_library name)

     install(TARGETS ${name}

       COMPONENT ${name}

       ${export_to_lldtargets}

-      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 (${ARG_SHARED} AND NOT CMAKE_CONFIGURATION_TYPES)

       add_llvm_install_targets(install-${name}

@@ -54,7 +54,7 @@ macro(add_lld_tool name)

 

     install(TARGETS ${name}

       ${export_to_lldtargets}

-      RUNTIME DESTINATION bin

+      RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR}

       COMPONENT ${name})

 

     if(NOT CMAKE_CONFIGURATION_TYPES)

@@ -69,5 +69,5 @@ endmacro()

 macro(add_lld_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()

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

index 5cff736ff57f..64e775c771b9 100644

--- a/tools/lld/CMakeLists.txt

+++ b/tools/lld/CMakeLists.txt

@@ -21,7 +21,7 @@ target_link_libraries(lld

   )

 

 install(TARGETS lld

-  RUNTIME DESTINATION bin)

+  RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR})

 

 if(NOT LLD_SYMLINKS_TO_CREATE)

   set(LLD_SYMLINKS_TO_CREATE