git.iko.soy/typeable/nixpkgs
on master help sign in
Merge pull request #65483 from arcnmx/pr-llvm-baremetal

llvm8 bare metal fixes

commit579168b5373357cb1a9b1b7fe067799b9e478817 authorMatthew Bauer <mjbauer95@gmail.com> dateWed 14 Aug 2019, 10:16 (7 years ago) parent3411c1524070da
3 files changed+58
pkgs/development/compilers/llvm/8/clang/compiler-rt-baremetal.patch+53 pkgs/development/compilers/llvm/8/clang/default.nix+2 pkgs/development/compilers/llvm/8/compiler-rt.nix+3
pkgs/development/compilers/llvm/8/clang/compiler-rt-baremetal.patchnew file+53
@@ -0,0 +1,53 @@
1+Index: lib/Driver/ToolChains/BareMetal.cpp
2+===================================================================
3+--- a/lib/Driver/ToolChains/BareMetal.cpp
4++++ b/lib/Driver/ToolChains/BareMetal.cpp
5+@@ -157,7 +157,7 @@
6+ void BareMetal::AddLinkRuntimeLib(const ArgList &Args,
7+ ArgStringList &CmdArgs) const {
8+ CmdArgs.push_back(Args.MakeArgString("-lclang_rt.builtins-" +
9+- getTriple().getArchName() + ".a"));
10++ getTriple().getArchName()));
11+ }
12+
13+ void baremetal::Linker::ConstructJob(Compilation &C, const JobAction &JA,
14+Index: test/Driver/baremetal.cpp
15+===================================================================
16+--- a/test/Driver/baremetal.cpp
17++++ b/test/Driver/baremetal.cpp
18+@@ -13,7 +13,7 @@
19+ // CHECK-V6M-C-NEXT: "{{[^"]*}}ld{{(\.(lld|bfd|gold))?}}{{(\.exe)?}}" "{{.*}}.o" "-Bstatic"
20+ // CHECK-V6M-C-SAME: "-L[[RESOURCE_DIR:[^"]+]]{{[/\\]+}}lib{{[/\\]+}}baremetal"
21+ // CHECK-V6M-C-SAME: "-T" "semihosted.lds" "-Lsome{{[/\\]+}}directory{{[/\\]+}}user{{[/\\]+}}asked{{[/\\]+}}for"
22+-// CHECK-V6M-C-SAME: "-lc" "-lm" "-lclang_rt.builtins-armv6m.a"
23++// CHECK-V6M-C-SAME: "-lc" "-lm" "-lclang_rt.builtins-armv6m"
24+ // CHECK-V6M-C-SAME: "-o" "{{.*}}.o"
25+
26+ // RUN: %clang -no-canonical-prefixes %s -### -o %t.o 2>&1 \
27+@@ -35,7 +35,7 @@
28+ // CHECK-V6M-DEFAULTCXX: "{{[^"]*}}ld{{(\.(lld|bfd|gold))?}}{{(\.exe)?}}" "{{.*}}.o" "-Bstatic"
29+ // CHECK-V6M-DEFAULTCXX-SAME: "-L{{[^"]*}}{{[/\\]+}}lib{{(64)?}}{{[/\\]+}}clang{{[/\\]+}}{{.*}}{{[/\\]+}}lib{{[/\\]+}}baremetal"
30+ // CHECK-V6M-DEFAULTCXX-SAME: "-lc++" "-lc++abi" "-lunwind"
31+-// CHECK-V6M-DEFAULTCXX-SAME: "-lc" "-lm" "-lclang_rt.builtins-armv6m.a"
32++// CHECK-V6M-DEFAULTCXX-SAME: "-lc" "-lm" "-lclang_rt.builtins-armv6m"
33+ // CHECK-V6M-DEFAULTCXX-SAME: "-o" "{{.*}}.o"
34+
35+ // RUN: %clangxx -no-canonical-prefixes %s -### -o %t.o 2>&1 \
36+@@ -48,7 +48,7 @@
37+ // CHECK-V6M-LIBCXX: "{{[^"]*}}ld{{(\.(lld|bfd|gold))?}}{{(\.exe)?}}" "{{.*}}.o" "-Bstatic"
38+ // CHECK-V6M-LIBCXX-SAME: "-L{{[^"]*}}{{[/\\]+}}lib{{(64)?}}{{[/\\]+}}clang{{[/\\]+}}{{.*}}{{[/\\]+}}lib{{[/\\]+}}baremetal"
39+ // CHECK-V6M-LIBCXX-SAME: "-lc++" "-lc++abi" "-lunwind"
40+-// CHECK-V6M-LIBCXX-SAME: "-lc" "-lm" "-lclang_rt.builtins-armv6m.a"
41++// CHECK-V6M-LIBCXX-SAME: "-lc" "-lm" "-lclang_rt.builtins-armv6m"
42+ // CHECK-V6M-LIBCXX-SAME: "-o" "{{.*}}.o"
43+
44+ // RUN: %clangxx -no-canonical-prefixes %s -### -o %t.o 2>&1 \
45+@@ -61,7 +61,7 @@
46+ // CHECK-V6M-LIBSTDCXX: "{{[^"]*}}ld{{(\.(lld|bfd|gold))?}}{{(\.exe)?}}" "{{.*}}.o" "-Bstatic"
47+ // CHECK-V6M-LIBSTDCXX-SAME: "-L{{[^"]*}}{{[/\\]+}}lib{{(64)?}}{{[/\\]+}}clang{{[/\\]+}}{{.*}}{{[/\\]+}}lib{{[/\\]+}}baremetal"
48+ // CHECK-V6M-LIBSTDCXX-SAME: "-lstdc++" "-lsupc++" "-lunwind"
49+-// CHECK-V6M-LIBSTDCXX-SAME: "-lc" "-lm" "-lclang_rt.builtins-armv6m.a"
50++// CHECK-V6M-LIBSTDCXX-SAME: "-lc" "-lm" "-lclang_rt.builtins-armv6m"
51+ // CHECK-V6M-LIBSTDCXX-SAME: "-o" "{{.*}}.o"
52+
53+ // RUN: %clangxx -no-canonical-prefixes %s -### -o %t.o 2>&1 \
pkgs/development/compilers/llvm/8/clang/default.nix+2
@@ -47,6 +47,8 @@ let
4747 # Backport for the `--unwindlib=[libgcc|compiler-rt]` flag, which is
4848 # needed for our bootstrapping to not interfere with C.
4949 ./unwindlib.patch
50+ # https://reviews.llvm.org/D51899
51+ ./compiler-rt-baremetal.patch
5052 ];
5153
5254 postPatch = ''
pkgs/development/compilers/llvm/8/compiler-rt.nix+3
@@ -27,6 +27,9 @@ stdenv.mkDerivation rec {
2727 "-DCOMPILER_RT_BUILD_XRAY=OFF"
2828 "-DCOMPILER_RT_BUILD_LIBFUZZER=OFF"
2929 "-DCOMPILER_RT_BUILD_PROFILE=OFF"
30+ ] ++ stdenv.lib.optionals (stdenv.hostPlatform.parsed.kernel.name == "none") [
31+ "-DCOMPILER_RT_BAREMETAL_BUILD=ON"
32+ "-DCOMPILER_RT_OS_DIR=baremetal"
3033 ];
3134
3235 outputs = [ "out" "dev" ];