Commit Graph

684 Commits

Author SHA1 Message Date
Maximilian Bosch
2c60e7c2d0
llvm*: compiler-rt: fix build w/glibc-2.31
https://hydra.nixos.org/build/122885657 and more.

Original upstream fix (available in llvm_10):

   947f969244
2020-06-29 14:41:43 +02:00
Holger Wünsche
0f0b14258b
clang_{5..10}: add RTTI
This fixes problems with missing symbols when using clang as library and
is most likely a result of llvm being build with RTTI enabled.
2020-06-27 20:37:11 +02:00
John Ericson
f3f7612a40 C++ Compilers: Systematize handling of standard libraries 2020-06-22 04:24:44 +00:00
Gabor Greif
d54bfa2a93 compiler-rt{6..10}: fix compilation on Darwin
addendum to https://github.com/NixOS/nixpkgs/pull/85945
2020-05-20 20:10:08 +02:00
John Ericson
1ac5398589 *-wrapper; Switch from infixSalt to suffixSalt
I hate the thing too even though I made it, and rather just get rid of
it. But we can't do that yet. In the meantime, this brings us more
inline with autoconf and will make it slightly easier for me to write a
pkg-config wrapper, which we need.
2020-05-12 00:44:44 -04:00
Atemu
d616ae8c6d llvm/compiler-rt: only apply armv7l patches on aarch32
No need for rebuilds on other platforms
2020-05-10 13:43:17 +09:00
Andrew Childs
d91d2bdf77 compiler-rt: fix build on armv7l 2020-05-10 03:50:38 +09:00
Frederik Rietdijk
9875bbae75 Merge master into staging-next 2020-05-05 19:51:09 +02:00
Atemu
896e2f4ba7 llvm_10: disable libpfm on aarch32
This is a speculative fix since the llvm_10 build runs OOM currently but it
should also be affected.

See parent commit for more info.
2020-05-03 08:11:45 +02:00
Atemu
00f35a4397 llvm_7,8,9: disable libpfm on aarch32
The armv7l builder has has the same issue some of the aarch64 ones have (#56245)

See:
https://hydra.nixos.org/eval/1583749?filter=llvm_&compare=1583176&full=#tabs-still-fail
https://nix-cache.s3.amazonaws.com/log/3ppqyssyqj5d6sh257zfb5rb6km4m6sa-llvm-7.1.0.drv
https://nix-cache.s3.amazonaws.com/log/rmacd5xwkw3lyb6zknc3sgdcb3cvk6k1-llvm-8.0.1.drv
https://nix-cache.s3.amazonaws.com/log/6s8pasqwkrzzv5lgw1l22zy7mrpzx2p3-llvm-9.0.1.drv
2020-05-03 08:11:10 +02:00
Benno Fünfstück
ed2ac0dcfa llvm_10: mark as big-parallel
LLVM builds frequently time out on hydra at least on AArch64. Marking
big-parallel gives them more resources to finish quicker.
2020-05-01 08:48:41 +02:00
Benno Fünfstück
7c27e8749d llvm_9: mark as big-parallel
LLVM builds frequently time out on hydra at least on AArch64. Marking
big-parallel gives them more resources to finish quicker.
2020-05-01 08:48:41 +02:00
Benno Fünfstück
4b3c3e10a6 llvm_8: mark as big-parallel
LLVM builds frequently time out on hydra at least on AArch64. Marking
big-parallel gives them more resources to finish quicker.
2020-05-01 08:48:41 +02:00
Benno Fünfstück
8c880d9434 llvm_7: mark as big-parallel
LLVM builds frequently time out on hydra at least on AArch64. Marking
big-parallel gives them more resources to finish quicker.
2020-05-01 08:48:41 +02:00
Benno Fünfstück
fc6a4600f8 llvm_6: mark as big-parallel
LLVM builds frequently time out on hydra at least on AArch64. Marking
big-parallel gives them more resources to finish quicker.
2020-05-01 08:48:41 +02:00
Matthew Bauer
ff642c5694 llvm/compiler-rt.nix: add i{4,5,6}86 to X86 architecture
Fixes #85622
2020-04-24 10:22:21 -05:00
Andreas Rammhold
d17650b654
llvm_10: link to the llvm compiler-rt share directory from the wrapper
This is required for features such as `-fsanitze=cfi` that (by default)
load the file `…/resource-root/share/cfi_blacklist.txt`.
2020-04-24 11:22:47 +02:00
Jan Tojnar
3d8e436917
Merge branch 'master' into staging-next 2020-04-16 10:09:43 +02:00
Travis Whitaker
74f3b25896 LLVM: Always pass host/target info to compiler-rt/libstdcxxClang 2020-04-13 18:49:27 -04:00
John Ericson
888c1685ad compiler-rt-10: Sync flags with previous versions
In 0c73297c07 I made some changes up to 9
for 20.03 and master, now I do the same for 10 which is just on master.
2020-04-13 13:22:31 -04:00
Jan Tojnar
a04625379a
Merge branch 'master' into staging-next 2020-04-13 18:50:35 +02:00
Michael Reilly
84cf00f980
treewide: Per RFC45, remove all unquoted URLs 2020-04-10 17:54:53 +01:00
Gabor Greif
e336bdf80e llvmPackages: change homepages to https:// scheme
also: https://www.cmake.org/Wiki/CMake_RPATH_handling has moved
2020-04-05 12:37:24 +02:00
Holger Wünsche
4665b2a9a2
llvmPackages_10: rc5 -> release
updated hashes and url
updated comment regarding version/release_version to make it clearer
2020-03-25 12:10:05 +01:00
Matthew Bauer
c08d6d55dc
Merge pull request #82781 from DieGoldeneEnte/llvm10-rc4
llvmPackages_10: rc3 -> rc4 -> rc5, polly enabled by default
2020-03-22 02:00:41 -04:00
Holger Wünsche
cdee144dfc
llvmPackges_10: rc4 -> rc5
updated versino and hashes for new rc
2020-03-19 17:43:39 +01:00
John Ericson
19a0b38cbe
Merge pull request #82882 from obsidiansystems/armv6-embedded
Misc fixes for armv6 bare metal cross
2020-03-19 10:38:22 -04:00
Holger Wünsche
e9aa8770ea
llvmPackages_10: removed extra polly-build
There is no good reason to have separate builds for polly and no-polly
versions. wwwwwThe reason for the two versions was (as far as I can
tell) to defer rebuilds (see ed60483257).
Polly is now enabled by default.
2020-03-19 10:47:20 +01:00
Holger Wünsche
0ec3f4e26b
llvmPackages_10: rc3 -> rc4
Only needed to update hashes and the version.
Updated comment for extension handling patch
2020-03-19 10:45:57 +01:00
John Ericson
0c73297c07 compiler-rt-{7,8,9}: Fix cmakeFlags in a few ways
- Cross to bare metal with GCC works

 - Flags are deduplicated

 - Darwin bootstrapping for 8 and 0 closer.

 - Flags are same across versions.
2020-03-18 12:10:09 -04:00
John Ericson
bc054004ac cc-wrapper, clang: libstdcxxHook should a propagated build input
Lumping it in with the target platform libraries was incorrect, and
caused eval failures when gcc couldn't be built for the target platform.
2020-03-18 11:28:52 -04:00
John Ericson
99c18b3441 clang-*: Sync wrapping logic
We only want to refer to GCC under these conditions.
2020-03-18 11:28:05 -04:00
Gabor Greif
3a84353edb llvmPackages_10: rc2 -> rc3
http://lists.llvm.org/pipermail/llvm-dev/2020-March/139729.html

Additionally cherry-picked 3 commits from `llvm-project/master`:
- llvm/llvm-project@d21664c
- llvm/llvm-project@3a0f6e6
- llvm/llvm-project@87dac7d

such that clang can automatically pick up the polly plugin from the
`llvm-polly` build.
2020-03-07 20:11:59 +01:00
Vladimír Čunát
fb6ceb45ba
Merge #80124: llvmPackages_5.compiler-rt: fix for glibc bump 2020-03-02 15:41:52 +01:00
Gabor Greif
f111c6f9ce llvmPackages_10: copy llvmPackages_9
* starting with rc2
* make `lldb` compilable again on Darwin
* separate out manpage creation for `lldb` into a new derivation
* minor tweaks to the patching of sources,
  some of which are backportable to earlier versions
2020-02-25 13:24:27 +01:00
Will Dietz
c25e18089a
llvmPackages_5.compiler-rt: fix for glibc bump using upstream fix 2020-02-14 10:59:31 -06:00
Frederik Rietdijk
c195ef6aab
Merge pull request #78928 from NixOS/staging-next
Staging next
2020-02-02 15:35:18 +01:00
Luka Blaskovic
0fc6280715 llvm_4: remove 2020-01-30 18:35:31 -05:00
Luka Blaskovic
0eafee8328 llvm_39: remove 2020-01-30 18:35:30 -05:00
Luka Blaskovic
3a12a7cde8 llvm_35: remove 2020-01-30 18:35:30 -05:00
Matthew Bauer
db29857eb3 Re-Revert "clang_7,clang_8,clang_9: fix compilation of HIP-code"
This reverts commit f14a4d60b7, and thus
applying 558af6fbc7.
2020-01-28 11:35:19 -05:00
Anders Kaseorg
3cd8ce3bce treewide: Fix unsafe concatenation of $LD_LIBRARY_PATH
Naive concatenation of $LD_LIBRARY_PATH can result in an empty
colon-delimited segment; this tells glibc to load libraries from the
current directory, which is definitely wrong, and may be a security
vulnerability if the current directory is untrusted.  (See #67234, for
example.)  Fix this throughout the tree.

Signed-off-by: Anders Kaseorg <andersk@mit.edu>
2020-01-15 09:47:03 +01:00
Frederik Rietdijk
bc18cc72dd
Merge pull request #77610 from LnL7/darwin-stdenv-python3
darwin-stdenv: bootstrap with python3
2020-01-15 09:24:57 +01:00
Daiderd Jordan
d0a90de910
llvmPackages: python2 -> python3 2020-01-13 11:13:56 +01:00
Matthew Bauer
cc669a18fb
Merge pull request #76669 from xbreak/clang-cmake-fix
clang_9: Correct ClangTargets-release.cmake
2020-01-06 15:42:34 -05:00
Frederik Rietdijk
828f93a326 Merge master into staging-next 2020-01-05 16:00:21 +01:00
John Ericson
ebec1d12a3
Merge pull request #76887 from corngood/llvm-cross-fix
llvm: use correct version of tablegen when cross compiling _8 and _9
2020-01-03 13:25:39 -05:00
David McFarland
6c86a2b5bb llvm: use correct version of tablegen when cross compiling _8 and _9 2020-01-03 10:38:43 -04:00
Will Dietz
dc0c28a762
clang_9: fix unpackPhase 2020-01-01 12:42:59 -06:00
Will Dietz
21b0162383
llvmPackages_9: 9.0.0 -> 9.0.1
Fetch from github release page,
as that's where https://releases.llvm.org/9.0.1 redirects.
2020-01-01 12:42:58 -06:00
Maximilian Bosch
129fbd7550
clang_4: fix build w/gcc9
As noted in the incorporated patch, name collisions between lambda
arguments and lambda captures cause compilation failures in GCC9[1].

The issue has been fixed in a later version of CLang, unfortunately the
relevant patches weren't backported to the versions 3.9 and 4.0[2].

[1] http://www.open-std.org/jtc1/sc22/wg21/docs/cwg_defects.html#2211
[2] bb177a9307 (diff-d63bede6ed85300ad2aaf4eaee571456L6278)
2019-12-30 02:50:50 +01:00
Maximilian Bosch
2e5fd9f03e
clang_39: fix build w/gcc9 2019-12-30 02:50:50 +01:00
xbreak
6748dd4ca0 clang_9: Correct ClangTargets-release.cmake
Since commit 4271020 libclang-cpp is also moved to $lib. This adds the missing
substitution in ClangTargets-release.cmake.
2019-12-29 23:26:32 +00:00
Franz Pletz
77b6c3cd06
Merge remote-tracking branch 'origin/master' into gcc-9 2019-12-26 14:17:36 +01:00
Joachim F
90f08689c3
Merge pull request #73766 from kmcopper/staging-compiler-rt
staging: compiler-rt scudo compatibility
2019-11-26 15:54:12 +00:00
John Ericson
6d3b7458cc
Merge pull request #74065 from Ericson2314/cc-versions
compilers, binutils: Add version and pname
2019-11-24 18:35:13 -05:00
Craig Hall
c40bf6ea3f llvm-manpages: Use pname 2019-11-24 18:32:26 +00:00
Craig Hall
4bcae6f8a7 llvm: Use pname 2019-11-24 18:32:26 +00:00
Craig Hall
a33dbd38cb clang-manpages: Use pname 2019-11-24 18:32:26 +00:00
Craig Hall
f1255e45db clang: Use pname 2019-11-24 18:32:26 +00:00
Craig Hall
2c59c1deb5 llvm: Add version attribute 2019-11-24 18:32:26 +00:00
Craig Hall
5a9c95d4d2 clang: Add version attribute 2019-11-24 18:32:26 +00:00
Kyle Copperfield
19adae30c1 llvm/compiler-rt: default to compatible scudo options 2019-11-19 16:10:39 +00:00
Frederik Rietdijk
c6e31d0767 Merge master into staging-next 2019-11-14 13:31:39 +01:00
Matthew Bauer
1c3deb9642
Merge pull request #73084 from lopsided98/llvm-7-armv6l
llvm_7: disable failing test on armv6l
2019-11-13 17:20:13 -05:00
Ben Wolsieffer
50c315fc4d llvm_9: disable failing test on armv6l 2019-11-09 11:01:12 -05:00
Ben Wolsieffer
e50b8fcfbd llvm_7: disable failing test on armv6l 2019-11-08 18:44:16 -05:00
Ben Wolsieffer
d67cd40cd8 llvm_9: disable failing tests on 32-bit ARM 2019-11-08 17:54:08 -05:00
Matthew Bauer
c10098322a
Merge pull request #70244 from nmattia/nm-fix-libcxx
libcxx: fix build on linux musl
2019-11-07 17:13:09 -05:00
Franz Pletz
4cbe75c067
llvm_4: fix build with gcc9 2019-11-05 22:11:26 +01:00
Franz Pletz
efeae34a34
llvm_5: fix build with gcc9 2019-11-05 19:08:18 +01:00
Matthew Bauer
977a311c1f
Merge pull request #70364 from matthewbauer/fix-clang-9-macos
llvm9/clang.nix: fix clang on macos
2019-10-04 11:01:51 -04:00
Nicolas Mattia
fadd37ba46 libcxx: don't produce shared libs on musl 2019-10-04 10:51:11 +02:00
Nicolas Mattia
e494de20b3 libcxxapi: don't produce shared libs on musl 2019-10-04 10:51:10 +02:00
Matthew Bauer
42710203b0 llvm9/clang.nix: fix clang on macos
Fixes #70243
2019-10-03 23:40:05 -04:00
Nicolas Mattia
76b54c75b3 libcxxabi: don't depend on libunwind 2019-10-03 13:39:19 +02:00
Matthew Bauer
1f95c9c933 llvm9/compiler-rt: fix on i686 2019-09-30 21:27:22 -04:00
Matthew Bauer
a7dc5c685e llvm/compiler: preserve hashes
Don’t require a mass rebuild for this fix.
2019-09-30 21:24:27 -04:00
Matthew Bauer
d303a2f431 llvm/compiler-rt: fix on i686
Only turn on cross related flags when useLLVM = true.

Fixes #66693
2019-09-30 21:24:27 -04:00
arcnmx
607a4a6e3a llvmPackages_9.compiler-rt: remove crt patch
This doesn't apply because it was merged upstream.
2019-09-29 18:34:31 -07:00
Vladimír Čunát
de99e7ce94
Merge #69115: llvmPackages_9: init 2019-09-29 11:03:06 +02:00
Joachim Fasting
bad07dfac5
tree-wide: replace uses of splitString "." with lib.versions
Quoting from the splitString docstring:

   NOTE: this function is not performant and should never be used.

This replaces trivial uses of splitString for splitting version
strings with the (potentially builtin) splitVersion.
2019-09-26 17:42:49 +02:00
Will Dietz
233ba4052a
llvm_9: fix test failing on non-x86, such as our aarch64 2019-09-20 22:08:05 -05:00
Will Dietz
9943cb0fa1
lldb_9: fix build, nixpkgs-fmt 2019-09-19 18:40:47 -05:00
Will Dietz
73b11eb566
llvmPackages_9: fetch from releases.llvm.org ("for now") 2019-09-19 18:39:03 -05:00
Will Dietz
60f4d2f660
clang_9: drop included patches 2019-09-19 15:34:42 -05:00
Will Dietz
74b529b43e
llvm_9: fix utf8 test by using builtin locale C.UTF-8 2019-09-19 14:39:37 -05:00
Will Dietz
f52b3afc8d
clang_9: wiggle the purity.patch so it applies 2019-09-19 14:07:15 -05:00
Will Dietz
99eeff0f69
llvmPackages_9: hashes, pname-ification 2019-09-19 13:24:37 -05:00
Will Dietz
9552213d07
llvmPackages_9: copy llvmPackages_8 2019-09-19 13:19:41 -05:00
Frederik Rietdijk
5f4734b1dd Merge remote-tracking branch 'upstream/gcc-8' into staging-next
Earlier the gcc8 branch was merged instead of the gcc-8 branch (note the dash)...
2019-09-08 20:44:26 +02:00
Franz Pletz
de85797565
Merge remote-tracking branch 'origin/master' into gcc-8 2019-09-03 22:15:07 +02:00
Franz Pletz
be9901afe2
llvm_38: drop since it doesn't build with gcc8 2019-09-03 22:04:44 +02:00
Franz Pletz
e3434a3c36
llvm_4: fix build with gcc8 2019-09-03 21:24:40 +02:00
volth
08f68313a4 treewide: remove redundant rec 2019-08-28 11:07:32 +00:00
Robin Gloster
616b8343c4
Merge remote-tracking branch 'upstream/master' into gcc-8 2019-08-25 18:55:46 +02:00
volth
c814d72b51 treewide: name -> pname 2019-08-17 10:54:38 +00:00
Frederik Rietdijk
fe9a3e3e63 Merge staging-next into staging 2019-08-17 09:39:23 +02:00
volth
46420bbaa3 treewide: name -> pname (easy cases) (#66585)
treewide replacement of

stdenv.mkDerivation rec {
  name = "*-${version}";
  version = "*";

to pname
2019-08-15 13:41:18 +01:00
Matthew Bauer
579168b537
Merge pull request #65483 from arcnmx/pr-llvm-baremetal
llvm8 bare metal fixes
2019-08-14 10:16:57 -04:00