llvmPackages_34: remove unused
This commit is contained in:
parent
d296a379ba
commit
944586699e
@ -1,19 +0,0 @@
|
|||||||
diff -Naur clang-3.4-orig/lib/Driver/Tools.cpp clang-3.4/lib/Driver/Tools.cpp
|
|
||||||
--- clang-3.4-orig/lib/Driver/Tools.cpp 2013-12-08 21:59:27.000000000 -0500
|
|
||||||
+++ clang-3.4/lib/Driver/Tools.cpp 2014-01-27 12:48:29.421872597 -0500
|
|
||||||
@@ -6477,15 +6477,6 @@
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
- if (ToolChain.getArch() == llvm::Triple::arm ||
|
|
||||||
- ToolChain.getArch() == llvm::Triple::thumb ||
|
|
||||||
- (!Args.hasArg(options::OPT_static) &&
|
|
||||||
- !Args.hasArg(options::OPT_shared))) {
|
|
||||||
- CmdArgs.push_back("-dynamic-linker");
|
|
||||||
- CmdArgs.push_back(Args.MakeArgString(
|
|
||||||
- D.DyldPrefix + getLinuxDynamicLinker(Args, ToolChain)));
|
|
||||||
- }
|
|
||||||
-
|
|
||||||
CmdArgs.push_back("-o");
|
|
||||||
CmdArgs.push_back(Output.getFilename());
|
|
||||||
|
|
@ -1,8 +0,0 @@
|
|||||||
diff -Naur clang-3.4-orig/tools/extra/CMakeLists.txt clang-3.4/tools/extra/CMakeLists.txt
|
|
||||||
--- clang-3.4-orig/tools/extra/CMakeLists.txt 2013-11-07 19:08:23.000000000 -0500
|
|
||||||
+++ clang-3.4/tools/extra/CMakeLists.txt 2014-01-20 11:47:22.678435223 -0500
|
|
||||||
@@ -1,3 +1,4 @@
|
|
||||||
+include(CheckLibraryExists)
|
|
||||||
check_library_exists(edit el_init "" HAVE_LIBEDIT)
|
|
||||||
|
|
||||||
add_subdirectory(clang-apply-replacements)
|
|
@ -1,56 +0,0 @@
|
|||||||
{ stdenv, fetch, cmake, libxml2, libedit, llvm, zlib, version, clang-tools-extra_src }:
|
|
||||||
|
|
||||||
stdenv.mkDerivation {
|
|
||||||
name = "clang-${version}";
|
|
||||||
|
|
||||||
unpackPhase = ''
|
|
||||||
unpackFile ${fetch "cfe" "045wjnp5j8xd2zjhvldcllnwlnrwz3dafmlk412z804d5xvzb9jv"}
|
|
||||||
mv cfe-${version}.src clang
|
|
||||||
sourceRoot=$PWD/clang
|
|
||||||
unpackFile ${clang-tools-extra_src}
|
|
||||||
mv clang-tools-extra-* $sourceRoot/tools/extra
|
|
||||||
# !!! Hopefully won't be needed for 3.5
|
|
||||||
unpackFile ${llvm.src}
|
|
||||||
export cmakeFlags="$cmakeFlags -DCLANG_PATH_TO_LLVM_SOURCE="`ls -d $PWD/llvm-*`
|
|
||||||
(cd llvm-* && patch -Np1 -i ${./llvm-separate-build.patch})
|
|
||||||
'';
|
|
||||||
|
|
||||||
patches = [ ./clang-separate-build.patch ./clang-purity.patch ];
|
|
||||||
|
|
||||||
buildInputs = [ cmake libedit libxml2 zlib ];
|
|
||||||
|
|
||||||
cmakeFlags = [
|
|
||||||
"-DCMAKE_CXX_FLAGS=-std=c++11"
|
|
||||||
"-DCLANG_PATH_TO_LLVM_BUILD=${llvm}"
|
|
||||||
] ++
|
|
||||||
(stdenv.lib.optional (stdenv.cc.libc != null) "-DC_INCLUDE_DIRS=${stdenv.cc.libc}/include") ++
|
|
||||||
(stdenv.lib.optional (stdenv.cc.cc != null) "-DGCC_INSTALL_PREFIX=${stdenv.cc.cc}");
|
|
||||||
|
|
||||||
# Clang expects to find LLVMgold in its own prefix
|
|
||||||
# Clang expects to find sanitizer libraries in its own prefix
|
|
||||||
postInstall = ''
|
|
||||||
if [ -e ${llvm}/lib/LLVMgold.so ]; then
|
|
||||||
ln -sv ${llvm}/lib/LLVMgold.so $out/lib
|
|
||||||
fi
|
|
||||||
|
|
||||||
ln -sv ${llvm}/lib/clang/${version}/lib $out/lib/clang/${version}/
|
|
||||||
'';
|
|
||||||
|
|
||||||
passthru = {
|
|
||||||
isClang = true;
|
|
||||||
cc = stdenv.cc.cc;
|
|
||||||
# GCC_INSTALL_PREFIX points here, so just use it even though it may not
|
|
||||||
# actually be a gcc
|
|
||||||
gcc = stdenv.cc.cc;
|
|
||||||
hardeningUnsupportedFlags = [ "stackprotector" ];
|
|
||||||
};
|
|
||||||
|
|
||||||
enableParallelBuilding = true;
|
|
||||||
|
|
||||||
meta = {
|
|
||||||
description = "A c, c++, objective-c, and objective-c++ frontend for the llvm compiler";
|
|
||||||
homepage = http://llvm.org/;
|
|
||||||
license = stdenv.lib.licenses.ncsa;
|
|
||||||
platforms = stdenv.lib.platforms.all;
|
|
||||||
};
|
|
||||||
}
|
|
@ -1,37 +0,0 @@
|
|||||||
{ newScope, stdenv, isl, fetchurl }:
|
|
||||||
let
|
|
||||||
callPackage = newScope (self // { inherit stdenv isl version fetch; });
|
|
||||||
|
|
||||||
version = "3.4";
|
|
||||||
|
|
||||||
fetch = fetch_v version;
|
|
||||||
fetch_v = ver: name: sha256: fetchurl {
|
|
||||||
url = "http://llvm.org/releases/${ver}/${name}-${ver}.src.tar.gz";
|
|
||||||
inherit sha256;
|
|
||||||
};
|
|
||||||
|
|
||||||
compiler-rt_src = fetch "compiler-rt" "0p5b6varxdqn7q3n77xym63hhq4qqxd2981pfpa65r1w72qqjz7k";
|
|
||||||
clang-tools-extra_src = fetch "clang-tools-extra" "1d1822mwxxl9agmyacqjw800kzz5x8xr0sdmi8fgx5xfa5sii1ds";
|
|
||||||
|
|
||||||
self = {
|
|
||||||
llvm = callPackage ./llvm.nix rec {
|
|
||||||
version = "3.4.2";
|
|
||||||
fetch = fetch_v version;
|
|
||||||
inherit compiler-rt_src;
|
|
||||||
};
|
|
||||||
|
|
||||||
clang = callPackage ./clang.nix rec {
|
|
||||||
version = "3.4.2";
|
|
||||||
fetch = fetch_v version;
|
|
||||||
inherit clang-tools-extra_src;
|
|
||||||
};
|
|
||||||
|
|
||||||
lld = callPackage ./lld.nix {};
|
|
||||||
|
|
||||||
lldb = callPackage ./lldb.nix {};
|
|
||||||
|
|
||||||
polly = callPackage ./polly.nix {};
|
|
||||||
|
|
||||||
dragonegg = callPackage ./dragonegg.nix {};
|
|
||||||
};
|
|
||||||
in self
|
|
@ -1,35 +0,0 @@
|
|||||||
{stdenv, fetch, fetchpatch, llvm, gmp, mpfr, libmpc, ncurses, zlib, version}:
|
|
||||||
|
|
||||||
stdenv.mkDerivation rec {
|
|
||||||
name = "dragonegg-${version}";
|
|
||||||
|
|
||||||
src = fetch "dragonegg" "1733czbvby1ww3xkwcwmm0km0bpwhfyxvf56wb0zv5gksp3kbgrl";
|
|
||||||
|
|
||||||
patches = [(fetchpatch {
|
|
||||||
url = "https://llvm.org/viewvc/llvm-project/dragonegg/trunk/src/x86/ABIHack.inc"
|
|
||||||
+ "?r1=208730&r2=208729&view=patch";
|
|
||||||
sha256 = "1al82gqz90hzjx24p0wls029lw2bgnlgd209kgvxsp82p4z1v1c1";
|
|
||||||
name = "bug-18548.patch";
|
|
||||||
})];
|
|
||||||
patchFlags = "-p2";
|
|
||||||
|
|
||||||
# The gcc the plugin will be built for (the same used building dragonegg)
|
|
||||||
GCC = "gcc";
|
|
||||||
|
|
||||||
buildInputs = [ llvm gmp mpfr libmpc ncurses zlib ];
|
|
||||||
|
|
||||||
installPhase = ''
|
|
||||||
mkdir -p $out/lib $out/share/doc/${name}
|
|
||||||
cp -d dragonegg.so $out/lib
|
|
||||||
cp README COPYING $out/share/doc/${name}
|
|
||||||
'';
|
|
||||||
|
|
||||||
meta = {
|
|
||||||
homepage = http://dragonegg.llvm.org/;
|
|
||||||
description = "gcc plugin that replaces gcc's optimizers and code generators by those in LLVM";
|
|
||||||
license = stdenv.lib.licenses.gpl2Plus;
|
|
||||||
maintainers = with stdenv.lib.maintainers; [viric];
|
|
||||||
platforms = with stdenv.lib.platforms; linux;
|
|
||||||
broken = true;
|
|
||||||
};
|
|
||||||
}
|
|
@ -1,29 +0,0 @@
|
|||||||
{ stdenv, fetch, cmake, llvm, ncurses, zlib, python2, version }:
|
|
||||||
|
|
||||||
stdenv.mkDerivation {
|
|
||||||
name = "lld-${version}";
|
|
||||||
|
|
||||||
src = fetch "lld" "1sd4scqynryfrmcc4h0ljgwn2dgjmbbmf38z50ya6l0janpd2nxz";
|
|
||||||
|
|
||||||
preUnpack = ''
|
|
||||||
# !!! Hopefully won't be needed for 3.5
|
|
||||||
unpackFile ${llvm.src}
|
|
||||||
export cmakeFlags="$cmakeFlags -DLLD_PATH_TO_LLVM_SOURCE="`ls -d $PWD/llvm-*`
|
|
||||||
'';
|
|
||||||
|
|
||||||
buildInputs = [ cmake ncurses zlib python2 ];
|
|
||||||
|
|
||||||
cmakeFlags = [
|
|
||||||
"-DCMAKE_CXX_FLAGS=-std=c++11"
|
|
||||||
"-DLLD_PATH_TO_LLVM_BUILD=${llvm}"
|
|
||||||
];
|
|
||||||
|
|
||||||
enableParallelBuilding = true;
|
|
||||||
|
|
||||||
meta = {
|
|
||||||
description = "A set of modular code for creating linker tools";
|
|
||||||
homepage = http://llvm.org/;
|
|
||||||
license = stdenv.lib.licenses.ncsa;
|
|
||||||
platforms = stdenv.lib.platforms.all;
|
|
||||||
};
|
|
||||||
}
|
|
@ -1,43 +0,0 @@
|
|||||||
{ stdenv
|
|
||||||
, fetch
|
|
||||||
, cmake
|
|
||||||
, zlib
|
|
||||||
, ncurses
|
|
||||||
, swig
|
|
||||||
, which
|
|
||||||
, libedit
|
|
||||||
, llvm
|
|
||||||
, clang
|
|
||||||
, python2
|
|
||||||
, version
|
|
||||||
}:
|
|
||||||
|
|
||||||
stdenv.mkDerivation {
|
|
||||||
name = "lldb-${version}";
|
|
||||||
|
|
||||||
src = fetch "lldb" "0h8cmjrhjhigk7k2qll1pcf6jfgmbdzkzfz2i048pkfg851s0x4g";
|
|
||||||
|
|
||||||
patchPhase = ''
|
|
||||||
sed -i 's|/usr/bin/env||' \
|
|
||||||
scripts/Python/finish-swig-Python-LLDB.sh \
|
|
||||||
scripts/Python/build-swig-Python.sh
|
|
||||||
'';
|
|
||||||
|
|
||||||
buildInputs = [ cmake python2 which swig ncurses zlib libedit ];
|
|
||||||
|
|
||||||
cmakeFlags = [
|
|
||||||
"-DCMAKE_CXX_FLAGS=-std=c++11"
|
|
||||||
"-DLLDB_PATH_TO_LLVM_BUILD=${llvm}"
|
|
||||||
"-DLLDB_PATH_TO_CLANG_BUILD=${clang}"
|
|
||||||
"-DLLDB_DISABLE_LIBEDIT=1" # https://llvm.org/bugs/show_bug.cgi?id=28898
|
|
||||||
];
|
|
||||||
|
|
||||||
enableParallelBuilding = true;
|
|
||||||
|
|
||||||
meta = {
|
|
||||||
description = "A next-generation high-performance debugger";
|
|
||||||
homepage = http://llvm.org/;
|
|
||||||
license = stdenv.lib.licenses.ncsa;
|
|
||||||
platforms = stdenv.lib.platforms.all;
|
|
||||||
};
|
|
||||||
}
|
|
@ -1,12 +0,0 @@
|
|||||||
diff -Naur llvm-3.4-orig/cmake/modules/TableGen.cmake llvm-3.4/cmake/modules/TableGen.cmake
|
|
||||||
--- llvm-3.4-orig/cmake/modules/TableGen.cmake 2013-10-06 21:00:07.000000000 -0400
|
|
||||||
+++ llvm-3.4/cmake/modules/TableGen.cmake 2014-01-20 13:06:55.273022149 -0500
|
|
||||||
@@ -78,8 +78,6 @@
|
|
||||||
endif()
|
|
||||||
|
|
||||||
macro(add_tablegen target project)
|
|
||||||
- set(CMAKE_RUNTIME_OUTPUT_DIRECTORY ${LLVM_TOOLS_BINARY_DIR})
|
|
||||||
-
|
|
||||||
set(${target}_OLD_LLVM_LINK_COMPONENTS ${LLVM_LINK_COMPONENTS})
|
|
||||||
set(LLVM_LINK_COMPONENTS ${LLVM_LINK_COMPONENTS} TableGen)
|
|
||||||
add_llvm_utility(${target} ${ARGN})
|
|
@ -1,94 +0,0 @@
|
|||||||
{ stdenv
|
|
||||||
, fetch
|
|
||||||
, fetchpatch
|
|
||||||
, perl
|
|
||||||
, groff
|
|
||||||
, cmake
|
|
||||||
, python2
|
|
||||||
, libffi
|
|
||||||
, libbfd
|
|
||||||
, libxml2
|
|
||||||
, ncurses
|
|
||||||
, version
|
|
||||||
, zlib
|
|
||||||
, compiler-rt_src
|
|
||||||
, debugVersion ? false
|
|
||||||
}:
|
|
||||||
|
|
||||||
let
|
|
||||||
src = fetch "llvm" "1mzgy7r0dma0npi1qrbr1s5n4nbj1ipxgbiw0q671l4s0r3qs0qp";
|
|
||||||
in stdenv.mkDerivation rec {
|
|
||||||
name = "llvm-${version}";
|
|
||||||
|
|
||||||
unpackPhase = ''
|
|
||||||
unpackFile ${src}
|
|
||||||
mv llvm-${version}.src llvm
|
|
||||||
sourceRoot=$PWD/llvm
|
|
||||||
unpackFile ${compiler-rt_src}
|
|
||||||
mv compiler-rt-* $sourceRoot/projects/compiler-rt
|
|
||||||
'';
|
|
||||||
|
|
||||||
buildInputs =
|
|
||||||
[ perl groff cmake libxml2 libffi python2 ] /*
|
|
||||||
++ stdenv.lib.optional stdenv.isLinux valgrind */;
|
|
||||||
|
|
||||||
propagatedBuildInputs = [ ncurses zlib ];
|
|
||||||
|
|
||||||
patches = stdenv.lib.optionals (!stdenv.isDarwin) [
|
|
||||||
# llvm-config --libfiles returns (non-existing) static libs
|
|
||||||
../fix-llvm-config.patch
|
|
||||||
];
|
|
||||||
|
|
||||||
postPatch = stdenv.lib.optionalString (stdenv ? glibc) ''
|
|
||||||
(
|
|
||||||
cd projects/compiler-rt
|
|
||||||
patch -p1 -F3 < ${
|
|
||||||
fetchpatch {
|
|
||||||
name = "sigaltstack.patch"; # for glibc-2.26
|
|
||||||
url = https://github.com/llvm-mirror/compiler-rt/commit/8a5e425a68d.diff;
|
|
||||||
sha256 = "0h4y5vl74qaa7dl54b1fcyqalvlpd8zban2d1jxfkxpzyi7m8ifi";
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
sed -i "s,#include <pthread.h>,&\n#include <signal.h>,g" \
|
|
||||||
lib/asan/asan_linux.cc
|
|
||||||
)
|
|
||||||
'';
|
|
||||||
|
|
||||||
# hacky fix: created binaries need to be run before installation
|
|
||||||
preBuild = ''
|
|
||||||
mkdir -p $out/
|
|
||||||
ln -sv $PWD/lib $out
|
|
||||||
'';
|
|
||||||
|
|
||||||
cmakeFlags = with stdenv; [
|
|
||||||
"-DCMAKE_BUILD_TYPE=${if debugVersion then "Debug" else "Release"}"
|
|
||||||
"-DLLVM_BUILD_TESTS=ON"
|
|
||||||
"-DLLVM_ENABLE_FFI=ON"
|
|
||||||
"-DLLVM_REQUIRES_RTTI=1"
|
|
||||||
"-DLLVM_BINUTILS_INCDIR=${libbfd.dev}/include"
|
|
||||||
"-DCMAKE_CXX_FLAGS=-std=c++11"
|
|
||||||
] ++ stdenv.lib.optional (!stdenv.isDarwin) "-DBUILD_SHARED_LIBS=ON";
|
|
||||||
|
|
||||||
postBuild = ''
|
|
||||||
rm -fR $out
|
|
||||||
|
|
||||||
paxmark m bin/{lli,llvm-rtdyld}
|
|
||||||
|
|
||||||
paxmark m unittests/ExecutionEngine/JIT/JITTests
|
|
||||||
paxmark m unittests/ExecutionEngine/MCJIT/MCJITTests
|
|
||||||
paxmark m unittests/Support/SupportTests
|
|
||||||
'';
|
|
||||||
|
|
||||||
enableParallelBuilding = true;
|
|
||||||
|
|
||||||
passthru.src = src;
|
|
||||||
|
|
||||||
meta = {
|
|
||||||
description = "Collection of modular and reusable compiler and toolchain technologies";
|
|
||||||
homepage = http://llvm.org/;
|
|
||||||
license = stdenv.lib.licenses.ncsa;
|
|
||||||
maintainers = with stdenv.lib.maintainers; [ lovek323 raskin ];
|
|
||||||
platforms = [ "i686-linux" "x86_64-linux" "x86_64-darwin" "armv7l-linux"];
|
|
||||||
};
|
|
||||||
}
|
|
@ -1,12 +0,0 @@
|
|||||||
diff -Naur polly-3.4-orig/CMakeLists.txt polly-3.4/CMakeLists.txt
|
|
||||||
--- polly-3.4-orig/CMakeLists.txt 2013-11-21 06:51:46.000000000 -0500
|
|
||||||
+++ polly-3.4/CMakeLists.txt 2014-01-20 18:49:34.907919933 -0500
|
|
||||||
@@ -53,7 +53,7 @@
|
|
||||||
execute_process(COMMAND "${LLVM_INSTALL_ROOT}/bin/llvm-config" --cxxflags
|
|
||||||
OUTPUT_VARIABLE LLVM_CXX_FLAGS
|
|
||||||
OUTPUT_STRIP_TRAILING_WHITESPACE)
|
|
||||||
- set(CMAKE_CXX_FLAGS ${CMAKE_CXX_FLAGS} ${LLVM_CXX_FLAGS})
|
|
||||||
+ set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} ${LLVM_CXX_FLAGS}")
|
|
||||||
endif(NOT DEFINED LLVM_MAIN_SRC_DIR)
|
|
||||||
|
|
||||||
set(POLLY_SOURCE_DIR ${CMAKE_CURRENT_SOURCE_DIR})
|
|
@ -1,25 +0,0 @@
|
|||||||
{ stdenv, fetch, cmake, isl, python2, gmp, llvm, version }:
|
|
||||||
|
|
||||||
stdenv.mkDerivation {
|
|
||||||
name = "polly-${version}";
|
|
||||||
|
|
||||||
src = fetch "polly" "1rqflmgzg1vzjm0r32c5ck8x3q0qm3g0hh8ggbjazh6x7nvmy6lz";
|
|
||||||
|
|
||||||
patches = [ ./polly-separate-build.patch ];
|
|
||||||
|
|
||||||
buildInputs = [ cmake isl python2 gmp ];
|
|
||||||
|
|
||||||
cmakeFlags = [
|
|
||||||
"-DCMAKE_CXX_FLAGS=-std=c++11"
|
|
||||||
"-DLLVM_INSTALL_ROOT=${llvm}"
|
|
||||||
];
|
|
||||||
|
|
||||||
enableParallelBuilding = true;
|
|
||||||
|
|
||||||
meta = {
|
|
||||||
description = "A polyhedral optimizer for llvm";
|
|
||||||
homepage = http://llvm.org/;
|
|
||||||
license = stdenv.lib.licenses.ncsa;
|
|
||||||
platforms = stdenv.lib.platforms.all;
|
|
||||||
};
|
|
||||||
}
|
|
@ -6277,7 +6277,6 @@ with pkgs;
|
|||||||
clang_38 = llvmPackages_38.clang;
|
clang_38 = llvmPackages_38.clang;
|
||||||
clang_37 = llvmPackages_37.clang;
|
clang_37 = llvmPackages_37.clang;
|
||||||
clang_35 = wrapCC llvmPackages_35.clang;
|
clang_35 = wrapCC llvmPackages_35.clang;
|
||||||
clang_34 = wrapCC llvmPackages_34.clang;
|
|
||||||
|
|
||||||
clang-tools = callPackage ../development/tools/clang-tools { };
|
clang-tools = callPackage ../development/tools/clang-tools { };
|
||||||
|
|
||||||
@ -6874,16 +6873,9 @@ with pkgs;
|
|||||||
llvm_38 = llvmPackages_38.llvm;
|
llvm_38 = llvmPackages_38.llvm;
|
||||||
llvm_37 = llvmPackages_37.llvm;
|
llvm_37 = llvmPackages_37.llvm;
|
||||||
llvm_35 = llvmPackages_35.llvm;
|
llvm_35 = llvmPackages_35.llvm;
|
||||||
llvm_34 = llvmPackages_34.llvm;
|
|
||||||
|
|
||||||
llvmPackages = recurseIntoAttrs llvmPackages_5;
|
llvmPackages = recurseIntoAttrs llvmPackages_5;
|
||||||
|
|
||||||
llvmPackages_34 = callPackage ../development/compilers/llvm/3.4 ({
|
|
||||||
isl = isl_0_12;
|
|
||||||
} // stdenv.lib.optionalAttrs (stdenv.cc.isGNU && stdenv.hostPlatform.isi686) {
|
|
||||||
stdenv = overrideCC stdenv buildPackages.gcc6;
|
|
||||||
});
|
|
||||||
|
|
||||||
llvmPackages_35 = callPackage ../development/compilers/llvm/3.5 ({
|
llvmPackages_35 = callPackage ../development/compilers/llvm/3.5 ({
|
||||||
isl = isl_0_14;
|
isl = isl_0_14;
|
||||||
} // stdenv.lib.optionalAttrs (stdenv.cc.isGNU && stdenv.hostPlatform.isi686) {
|
} // stdenv.lib.optionalAttrs (stdenv.cc.isGNU && stdenv.hostPlatform.isi686) {
|
||||||
|
Loading…
Reference in New Issue
Block a user