Merge pull request #283913 from a-n-n-a-l-e-e/llvm10-drop

Index: lib/Driver/ToolChains/BareMetal.cpp

===================================================================

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

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

@@ -157,7 +157,7 @@

 void BareMetal::AddLinkRuntimeLib(const ArgList &Args,

                                   ArgStringList &CmdArgs) const {

   CmdArgs.push_back(Args.MakeArgString("-lclang_rt.builtins-" +

-                                       getTriple().getArchName() + ".a"));

+                                       getTriple().getArchName()));

 }

 void baremetal::Linker::ConstructJob(Compilation &C, const JobAction &JA,

Index: test/Driver/baremetal.cpp

===================================================================

--- a/test/Driver/baremetal.cpp

+++ b/test/Driver/baremetal.cpp

@@ -13,7 +13,7 @@

 // CHECK-V6M-C-NEXT: "{{[^"]*}}ld{{(\.(lld|bfd|gold))?}}{{(\.exe)?}}" "{{.*}}.o" "-Bstatic"

 // CHECK-V6M-C-SAME: "-L[[RESOURCE_DIR:[^"]+]]{{[/\\]+}}lib{{[/\\]+}}baremetal"

 // CHECK-V6M-C-SAME: "-T" "semihosted.lds" "-Lsome{{[/\\]+}}directory{{[/\\]+}}user{{[/\\]+}}asked{{[/\\]+}}for"

-// CHECK-V6M-C-SAME: "-lc" "-lm" "-lclang_rt.builtins-armv6m.a"

+// CHECK-V6M-C-SAME: "-lc" "-lm" "-lclang_rt.builtins-armv6m"

 // CHECK-V6M-C-SAME: "-o" "{{.*}}.o"

 // RUN: %clang -no-canonical-prefixes %s -### -o %t.o 2>&1 \

@@ -35,7 +35,7 @@

 // CHECK-V6M-DEFAULTCXX: "{{[^"]*}}ld{{(\.(lld|bfd|gold))?}}{{(\.exe)?}}" "{{.*}}.o" "-Bstatic"

 // CHECK-V6M-DEFAULTCXX-SAME: "-L{{[^"]*}}{{[/\\]+}}lib{{(64)?}}{{[/\\]+}}clang{{[/\\]+}}{{.*}}{{[/\\]+}}lib{{[/\\]+}}baremetal"

 // CHECK-V6M-DEFAULTCXX-SAME: "-lc++" "-lc++abi" "-lunwind"

-// CHECK-V6M-DEFAULTCXX-SAME: "-lc" "-lm" "-lclang_rt.builtins-armv6m.a"

+// CHECK-V6M-DEFAULTCXX-SAME: "-lc" "-lm" "-lclang_rt.builtins-armv6m"

 // CHECK-V6M-DEFAULTCXX-SAME: "-o" "{{.*}}.o"

 // RUN: %clangxx -no-canonical-prefixes %s -### -o %t.o 2>&1 \

@@ -48,7 +48,7 @@

 // CHECK-V6M-LIBCXX: "{{[^"]*}}ld{{(\.(lld|bfd|gold))?}}{{(\.exe)?}}" "{{.*}}.o" "-Bstatic"

 // CHECK-V6M-LIBCXX-SAME: "-L{{[^"]*}}{{[/\\]+}}lib{{(64)?}}{{[/\\]+}}clang{{[/\\]+}}{{.*}}{{[/\\]+}}lib{{[/\\]+}}baremetal"

 // CHECK-V6M-LIBCXX-SAME: "-lc++" "-lc++abi" "-lunwind"

-// CHECK-V6M-LIBCXX-SAME: "-lc" "-lm" "-lclang_rt.builtins-armv6m.a"

+// CHECK-V6M-LIBCXX-SAME: "-lc" "-lm" "-lclang_rt.builtins-armv6m"

 // CHECK-V6M-LIBCXX-SAME: "-o" "{{.*}}.o"

 // RUN: %clangxx -no-canonical-prefixes %s -### -o %t.o 2>&1 \

@@ -61,7 +61,7 @@

 // CHECK-V6M-LIBSTDCXX: "{{[^"]*}}ld{{(\.(lld|bfd|gold))?}}{{(\.exe)?}}" "{{.*}}.o" "-Bstatic"

 // CHECK-V6M-LIBSTDCXX-SAME: "-L{{[^"]*}}{{[/\\]+}}lib{{(64)?}}{{[/\\]+}}clang{{[/\\]+}}{{.*}}{{[/\\]+}}lib{{[/\\]+}}baremetal"

 // CHECK-V6M-LIBSTDCXX-SAME: "-lstdc++" "-lsupc++" "-lunwind"

-// CHECK-V6M-LIBSTDCXX-SAME: "-lc" "-lm" "-lclang_rt.builtins-armv6m.a"

+// CHECK-V6M-LIBSTDCXX-SAME: "-lc" "-lm" "-lclang_rt.builtins-armv6m"

 // CHECK-V6M-LIBSTDCXX-SAME: "-o" "{{.*}}.o"

 // RUN: %clangxx -no-canonical-prefixes %s -### -o %t.o 2>&1 \

{ lib, stdenv, llvm_meta, fetch, substituteAll, cmake, libxml2, libllvm, version, clang-tools-extra_src, python3

, buildLlvmTools

, fixDarwinDylibNames

, enableManpages ? false

}:

let

  self = stdenv.mkDerivation ({

    pname = "clang";

    inherit version;

    src = fetch "clang" "091bvcny2lh32zy8f3m9viayyhb2zannrndni7325rl85cwgr6pr";

    unpackPhase = ''

      unpackFile $src

      mv clang-${version}* clang

      sourceRoot=$PWD/clang

      unpackFile ${clang-tools-extra_src}

      mv clang-tools-extra-* $sourceRoot/tools/extra

    '';

    nativeBuildInputs = [ cmake python3 ]

      ++ lib.optional enableManpages python3.pkgs.sphinx

      ++ lib.optional stdenv.hostPlatform.isDarwin fixDarwinDylibNames;

    buildInputs = [ libxml2 libllvm ];

    cmakeFlags = [

      "-DCLANGD_BUILD_XPC=OFF"

      "-DLLVM_ENABLE_RTTI=ON"

    ] ++ lib.optionals enableManpages [

      "-DCLANG_INCLUDE_DOCS=ON"

      "-DLLVM_ENABLE_SPHINX=ON"

      "-DSPHINX_OUTPUT_MAN=ON"

      "-DSPHINX_OUTPUT_HTML=OFF"

      "-DSPHINX_WARNINGS_AS_ERRORS=OFF"

    ] ++ lib.optionals (stdenv.hostPlatform != stdenv.buildPlatform) [

      "-DLLVM_TABLEGEN_EXE=${buildLlvmTools.llvm}/bin/llvm-tblgen"

      "-DCLANG_TABLEGEN=${buildLlvmTools.libclang.dev}/bin/clang-tblgen"

    ];

    patches = [

      ./purity.patch

      # https://reviews.llvm.org/D51899

      ./compiler-rt-baremetal.patch

      ./gnu-install-dirs.patch

      (substituteAll {

        src = ../../clang-6-10-LLVMgold-path.patch;

        libllvmLibdir = "${libllvm.lib}/lib";

      })

    ];

    postPatch = ''

      sed -i -e 's/DriverArgs.hasArg(options::OPT_nostdlibinc)/true/' \

             -e 's/Args.hasArg(options::OPT_nostdlibinc)/true/' \

             lib/Driver/ToolChains/*.cpp

    '' + lib.optionalString stdenv.hostPlatform.isMusl ''

      sed -i -e 's/lgcc_s/lgcc_eh/' lib/Driver/ToolChains/*.cpp

    '' + lib.optionalString stdenv.hostPlatform.isDarwin ''

      substituteInPlace tools/extra/clangd/CMakeLists.txt \

        --replace "NOT HAVE_CXX_ATOMICS64_WITHOUT_LIB" FALSE

    '';

    outputs = [ "out" "lib" "dev" "python" ];

    postInstall = ''

      ln -sv $out/bin/clang $out/bin/cpp

      # Move libclang to 'lib' output

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

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

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

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

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

      mkdir -p $python/bin $python/share/{clang,scan-view}

      mv $out/bin/{git-clang-format,scan-view} $python/bin

      if [ -e $out/bin/set-xcode-analyzer ]; then

        mv $out/bin/set-xcode-analyzer $python/bin

      fi

      mv $out/share/clang/*.py $python/share/clang

      mv $out/share/scan-view/*.py $python/share/scan-view

      rm $out/bin/c-index-test

      patchShebangs $python/bin

      mkdir -p $dev/bin

      cp bin/clang-tblgen $dev/bin

    '';

    passthru = {

      inherit libllvm;

      isClang = true;

      hardeningUnsupportedFlags = [ "fortify3" ];

    };

    meta = llvm_meta // {

      homepage = "https://clang.llvm.org/";

      description = "A C language family frontend for LLVM";

      longDescription = ''

        The Clang project provides a language front-end and tooling

        infrastructure for languages in the C language family (C, C++, Objective

        C/C++, OpenCL, CUDA, and RenderScript) for the LLVM project.

        It aims to deliver amazingly fast compiles, extremely useful error and

        warning messages and to provide a platform for building great source

        level tools. The Clang Static Analyzer and clang-tidy are tools that

        automatically find bugs in your code, and are great examples of the sort

        of tools that can be built using the Clang frontend as a library to

        parse C/C++ code.

      '';

      mainProgram = "clang";

    };

  } // lib.optionalAttrs enableManpages {

    pname = "clang-manpages";

    buildPhase = ''

      make docs-clang-man

    '';

    installPhase = ''

      mkdir -p $out/share/man/man1

      # Manually install clang manpage

      cp docs/man/*.1 $out/share/man/man1/

    '';

    outputs = [ "out" ];

    doCheck = false;

    meta = llvm_meta // {

      description = "man page for Clang ${version}";

    };

  });

in self

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

index dc1413f4b597..c173531e624f 100644

--- a/CMakeLists.txt

+++ b/CMakeLists.txt

@@ -9,6 +9,8 @@ endif()

 if( CMAKE_SOURCE_DIR STREQUAL CMAKE_CURRENT_SOURCE_DIR )

   project(Clang)

+  include(GNUInstallDirs)

+

   # Rely on llvm-config.

   set(CONFIG_OUTPUT)

   if(LLVM_CONFIG)

@@ -417,7 +419,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"

@@ -427,7 +429,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

@@ -447,7 +449,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 577cc11ab015..a4f4481d8442 100644

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

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

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

       install(TARGETS ${name}

         COMPONENT ${name}

         ${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-${name}

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

@@ -175,7 +175,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 85c3124234ad..64c48235d914 100644

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

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

@@ -191,7 +191,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/diagtool/CMakeLists.txt b/tools/diagtool/CMakeLists.txt

index a95444be40ee..136d96d9bf5b 100644

--- a/tools/diagtool/CMakeLists.txt

+++ b/tools/diagtool/CMakeLists.txt

@@ -21,7 +21,7 @@ clang_target_link_libraries(diagtool

 if (NOT LLVM_INSTALL_TOOLCHAIN_ONLY)

   install(TARGETS diagtool

     COMPONENT diagtool

-    RUNTIME DESTINATION bin)

+    RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR})

   if (NOT LLVM_ENABLE_IDE)

     add_llvm_install_targets(install-diagtool

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

index 973655361f71..0181002e4e3b 100644

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

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

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

@@ -172,7 +172,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 28241245fcb7..d6b59f02fc2a 100644

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

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

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

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

@@ -84,7 +84,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 22edb974bac7..9f140a9a4538 100644

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

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

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

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

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

@@ -494,13 +494,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) {

-      const std::string Loader =

-          D.DyldPrefix + ToolChain.getDynamicLinker(Args);

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

-      CmdArgs.push_back(Args.MakeArgString(Loader));

-    }

   }

   CmdArgs.push_back("-o");

-- 

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

@@ -301,6 +301,10 @@ if (NOT MSVC)

     i386/umoddi3.S

   )

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