Merge pull request #287640 from wegank/llvm-patches-cleanup-2

{ 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" "zerocallusedregs" ];

    };

    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

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

, buildLlvmTools

, fixDarwinDylibNames

, enableManpages ? false

, enablePolly ? false # TODO: get this info from llvm (passthru?)

}:

let

  self = stdenv.mkDerivation ({

    pname = "clang";

    inherit version;

    src = fetch "cfe" "0ihnbdl058gvl2wdy45p5am55bq8ifx8m9mhcsgj9ax8yxlzvvvh";

    unpackPhase = ''

      unpackFile $src

      mv cfe-${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 = [

      "-DCMAKE_CXX_FLAGS=-std=c++11"

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

    ] ++ lib.optionals enablePolly [

      "-DWITH_POLLY=ON"

      "-DLINK_POLLY_INTO_TOOLS=ON"

    ];

    patches = [

      ../../common/clang/5-8-purity.patch

      ./xpc.patch

      # Backport for -static-pie, which the latter touches, and which is nice in

      # its own right.

      ./static-pie.patch

      # Backport for the `--unwindlib=[libgcc|compiler-rt]` flag, which is

      # needed for our bootstrapping to not interfere with C.

      ./unwindlib.patch

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

      ./compiler-rt-baremetal.patch

      # make clang -xhip use $PATH to find executables

      ./HIP-use-PATH-8.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"

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

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

      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" "zerocallusedregs" ];

    };

    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

--- lib/Support/Unix/Memory.inc

+++ lib/Support/Unix/Memory.inc

@@ -126,8 +126,12 @@

   Result.Address = Addr;

   Result.Size = NumPages*PageSize;

-  if (PFlags & MF_EXEC)

-    Memory::InvalidateInstructionCache(Result.Address, Result.Size);

+  // Rely on protectMappedMemory to invalidate instruction cache.

+  if (PFlags & MF_EXEC) {

+    EC = Memory::protectMappedMemory (Result, PFlags);

+    if (EC != std::error_code())

+      return MemoryBlock();

+  }

   return Result;

 }

@@ -156,15 +160,31 @@

     return std::error_code(EINVAL, std::generic_category());

   int Protect = getPosixProtectionFlags(Flags);

-

   uintptr_t Start = alignAddr((uint8_t *)M.Address - PageSize + 1, PageSize);

   uintptr_t End = alignAddr((uint8_t *)M.Address + M.Size, PageSize);

+

+  bool InvalidateCache = (Flags & MF_EXEC);

+

+#if defined(__arm__) || defined(__aarch64__)

+  // Certain ARM implementations treat icache clear instruction as a memory read,

+  // and CPU segfaults on trying to clear cache on !PROT_READ page.  Therefore we need

+  // to temporarily add PROT_READ for the sake of flushing the instruction caches.

+  if (InvalidateCache && !(Protect & PROT_READ)) {

+    int Result = ::mprotect((void *)Start, End - Start, Protect | PROT_READ);

+    if (Result != 0)

+      return std::error_code(errno, std::generic_category());

+

+    Memory::InvalidateInstructionCache(M.Address, M.Size);

+    InvalidateCache = false;

+  }

+#endif

+

   int Result = ::mprotect((void *)Start, End - Start, Protect);

   if (Result != 0)

     return std::error_code(errno, std::generic_category());

-  if (Flags & MF_EXEC)

+  if (InvalidateCache)

     Memory::InvalidateInstructionCache(M.Address, M.Size);

   return std::error_code();

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 (!Args.hasArg(options::OPT_static)) {

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

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

-

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

-      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