Unverified Commit ede46e4f authored by John Ericson's avatar John Ericson Committed by GitHub
Browse files

Merge pull request #182840 from doyougnu/bump_llvm_git 

llvmPackages_git: 2022-01-07 -> 2022-25-07, add README
parents 12b0f884 376625d4

pkgs/development/compilers/llvm/README.md

0 → 100644
+79 −0
Original line number Diff line number Diff line 
## How to upgrade llvm_git



- Run `update-git.py`.

  This will set the github revision and sha256 for `llvmPackages_git.llvm` to whatever the latest chromium build is using.

  For a more recent, commit run `nix-prefetch-github` and change the rev and sha256 accordingly.



- That was the easy part.

  The hard part is updating the patch files.



  The general process is:



  1. Try to build `llvmPackages_git.llvm` and associated packages such as

     `clang` and `compiler-rt`. You can use the `-L` and `--keep-failed` flags to make

     debugging patch errors easy, e.g., `nix build .#llvmPackages_git.clang -L --keep-failed`



  2. The build will error out with something similar to this:

     ```sh

     ...

     clang-unstable> patching sources

     clang-unstable> applying patch /nix/store/nndv6gq6w608n197fndvv5my4a5zg2qi-purity.patch

     clang-unstable> patching file lib/Driver/ToolChains/Gnu.cpp

     clang-unstable> Hunk #1 FAILED at 487.

     clang-unstable> 1 out of 1 hunk FAILED -- saving rejects to file lib/Driver/ToolChains/Gnu.cpp.rej

     note: keeping build directory '/tmp/nix-build-clang-unstable-2022-25-07.drv-17'

     error: builder for '/nix/store/zwi123kpkyz52fy7p6v23azixd807r8c-clang-unstable-2022-25-07.drv' failed with exit code 1;

            last 8 log lines:

            > unpacking sources

            > unpacking source archive /nix/store/mrxadx11wv1ckjr2208qgxp472pmmg6g-clang-src-unstable-2022-25-07

            > source root is clang-src-unstable-2022-25-07/clang

            > patching sources

            > applying patch /nix/store/nndv6gq6w608n197fndvv5my4a5zg2qi-purity.patch

            > patching file lib/Driver/ToolChains/Gnu.cpp

            > Hunk #1 FAILED at 487.

            > 1 out of 1 hunk FAILED -- saving rejects to file lib/Driver/ToolChains/Gnu.cpp.rej

            For full logs, run 'nix log /nix/store/zwi123kpkyz52fy7p6v23azixd807r8c-clang-unstable-2022-25-07.drv'.

     note: keeping build directory '/tmp/nix-build-compiler-rt-libc-unstable-2022-25-07.drv-20'

     error: 1 dependencies of derivation '/nix/store/ndbbh3wrl0l39b22azf46f1n7zlqwmag-clang-wrapper-unstable-2022-25-07.drv' failed to build

     ```



     Notice the `Hunk #1 Failed at 487` line.

     The lines above show us that the `purity.patch` failed on `lib/Driver/ToolChains/Gnu.cpp` when compiling `clang`.



 3. The task now is to cross reference the hunks in the purity patch with

    `lib/Driver/ToolCahins/Gnu.cpp.orig` to see why the patch failed.

    The `.orig` file will be in the build directory referenced in the line `note: keeping build directory ...`;

    this message results from the `--keep-failed` flag.



 4. Now you should be able to open whichever patch failed, and the `foo.orig` file that it failed on.

    Correct the patch by adapting it to the new code and be mindful of whitespace;

    which can be an easily missed reason for failures.

    For cases where the hunk is no longer needed you can simply remove it from the patch.



 This is fine for small corrections, but when more serious changes are needed its better to use git.



 1. Clone the LLVM monorepo at https://github.com/llvm/llvm-project/



 2. Check out the revision we were using before.



 3. Use `patch -p1 < path/to-path` in the project subdirectories to apply the patches and commit.



 4. Use `git rebase HEAD^ --onto <dest>` to rebase the patches onto the new revision we are trying to build, and fix all conflicts.



 5. Use `git diff HEAD^:<project> HEAD:<project>` to get subdir diff to write back to Nixpkgs.



## Information on our current patch sets



### "GNU Install Dirs" patches



Use CMake's [`GNUInstallDirs`](https://cmake.org/cmake/help/latest/module/GNUInstallDirs.html) to support multiple outputs.



Previously, LLVM Just hard-coded `bin`, `include`, and `lib${LLVM_TARGET_PREFIX}`.

We are making it use these variables.



For the older LLVM versions, these patches live in https://github.com/Ericson2314/llvm-project branches `split-prefix`.

Instead of applying the patches to the worktree per the above instructions, one can checkout those directly and rebase those instead.



For newer LLVM versions, enough has has been upstreamed,

(see https://reviews.llvm.org/differential/query/5UAfpj_9zHwY/ for my progress upstreaming),

that I have just assembled new gnu-install-dirs patches from the remaining unmerged patches instead of rebasing from the prior LLVM's gnu install dirs patch.

pkgs/development/compilers/llvm/git/clang/default.nix

+3 −1
Original line number Diff line number Diff line
@@ -15,6 +15,7 @@ let 
      mkdir -p "$out"

      cp -r ${monorepoSrc}/cmake "$out"

      cp -r ${monorepoSrc}/${pname} "$out"

      cp -r ${monorepoSrc}/clang-tools-extra "$out"

    '';



    sourceRoot = "${src.name}/${pname}";
@@ -26,6 +27,7 @@ let 
    buildInputs = [ libxml2 libllvm ];



    cmakeFlags = [

      "-DCLANG_INSTALL_PACKAGE_DIR=${placeholder "dev"}/lib/cmake/clang"

      "-DCMAKE_CXX_FLAGS=-std=c++14"

      "-DCLANGD_BUILD_XPC=OFF"

      "-DLLVM_ENABLE_RTTI=ON"
@@ -71,7 +73,7 @@ let 
      # Move libclang to 'lib' output

      moveToOutput "lib/libclang.*" "$lib"

      moveToOutput "lib/libclang-cpp.*" "$lib"

      substituteInPlace $out/lib/cmake/clang/ClangTargets-release.cmake \

      substituteInPlace $dev/lib/cmake/clang/ClangTargets-release.cmake \

          --replace "\''${_IMPORT_PREFIX}/lib/libclang." "$lib/lib/libclang." \

          --replace "\''${_IMPORT_PREFIX}/lib/libclang-cpp." "$lib/lib/libclang-cpp."

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

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

index 7ea37850ad60..ac0f2d4f60b4 100644

index c27beec313d7..480f13e73c9f 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)

@@ -424,7 +426,7 @@ include_directories(BEFORE

@@ -78,15 +78,17 @@ if(CLANG_BUILT_STANDALONE)

   if (NOT LLVM_CONFIG_FOUND)

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

     # path is removed.

-    set(MAIN_INCLUDE_DIR "${LLVM_INCLUDE_DIR}")

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

 

 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"

@@ -433,7 +435,7 @@ if (NOT LLVM_INSTALL_TOOLCHAIN_ONLY)

     )

-  set(LLVM_MAIN_INCLUDE_DIR "${MAIN_INCLUDE_DIR}" CACHE PATH "Path to llvm/include")

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

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

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

   set(LLVM_TOOLS_BINARY_DIR "${TOOLS_BINARY_DIR}" CACHE PATH "Path to llvm/bin")

@@ -128,7 +130,7 @@ if(CLANG_BUILT_STANDALONE)

     set(LLVM_INCLUDE_TESTS ON)

   endif()

 

   install(DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/include/clang

-    DESTINATION include

+    DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}

     COMPONENT clang-headers

     FILES_MATCHING

     PATTERN "CMakeFiles" EXCLUDE

@@ -453,7 +455,7 @@ if (NOT LLVM_INSTALL_TOOLCHAIN_ONLY)

-  include_directories("${LLVM_BINARY_DIR}/include" "${LLVM_MAIN_INCLUDE_DIR}")

+  include_directories(${LLVM_INCLUDE_DIRS})

   link_directories("${LLVM_LIBRARY_DIR}")

 

   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

   set( CMAKE_RUNTIME_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR}/bin )

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

index 5752f4277444..5bf08dbf5e83 100644

index 21ac332e4f5f..b16c314bd1e2 100644

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

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

@@ -118,9 +118,9 @@ macro(add_clang_library name)

@@ -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}

-          RUNTIME DESTINATION bin)

+          LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR}${LLVM_LIBDIR_SUFFIX}

+          ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR}${LLVM_LIBDIR_SUFFIX}

+          RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR})

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

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

     get_target_export_arg(${name} Clang export_to_clangtargets)

     install(TARGETS ${name}

       ${export_to_clangtargets}

-      RUNTIME DESTINATION bin

+      RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR}

       COMPONENT ${name})

 

     if(NOT LLVM_ENABLE_IDE)

@@ -174,7 +174,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 078988980c52..14b58614b40a 100644

index 6e2060991b92..b9bc930d26b8 100644

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

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

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

   FOLDER "Misc"

   RUNTIME_OUTPUT_DIRECTORY "${output_dir}")

@@ -420,7 +420,7 @@ add_header_target("openmp-resource-headers" ${openmp_wrapper_files})

 add_header_target("windows-resource-headers" ${windows_only_files})

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

 

-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 99c6081db2d6..0887102febb3 100644

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

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

@@ -49,7 +49,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)

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

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

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

index bf88dca0a34b..7a10181e7738 100644

index 8d95d0900e8c..ebc70ff7526d 100644

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

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

@@ -186,7 +186,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

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

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

           COMPONENT

             libclang-python-bindings

           DESTINATION
@@ -167,69 +72,34 @@ index bf88dca0a34b..7a10181e7738 100644 
 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 74334e53c9b1..ebaae33e4324 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)

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

index 061dc7ef4dd9..adc54b2edc32 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(PROGRAMS lib/libscanbuild/${lib}

-          DESTINATION lib/libscanbuild

+          DESTINATION "${CMAKE_INSTALL_LIBDIR}/libscanbuild"

           COMPONENT scan-build-py)

 endforeach()

 

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

index eccc6b83195b..ff72d9cf0666 100644

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

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

@@ -20,7 +20,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)

@@ -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(PROGRAMS lib/libscanbuild/resources/${resource}

-          DESTINATION lib/libscanbuild/resources

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

           COMPONENT scan-build-py)

 endforeach()

 

@@ -34,7 +34,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)

@@ -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(PROGRAMS lib/libear/${lib}

-          DESTINATION lib/libear

+          DESTINATION "${CMAKE_INSTALL_LIBDIR}/libear"

           COMPONENT scan-build-py)

 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/git/clang/purity.patch

+5 −4
Original line number Diff line number Diff line
@@ -11,12 +11,13 @@ 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) {

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



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

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

+2 −2
Original line number Diff line number Diff line
@@ -2,7 +2,7 @@ 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)

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

 

+  set(i486_SOURCES ${i386_SOURCES})

+  set(i586_SOURCES ${i386_SOURCES})
@@ -11,7 +11,7 @@ index 3a66dd9c3fb..7efc85d9f9f 100644 
   if (WIN32)

     set(i386_SOURCES

       ${i386_SOURCES}

@@ -608,6 +612,7 @@ else ()

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

   endif()

 

   foreach (arch ${BUILTIN_SUPPORTED_ARCH})