Skip to content

Commit 0cbb44a

Browse files
committed
auto merge of #11181 : luqmana/rust/up-llvm, r=alexcrichton
No longer need to handle GNUEABIHF and hard floats since LLVM should now choose the right default. Fixes #11164.
2 parents b5b570b + d9eaeda commit 0cbb44a

File tree

4 files changed

+4
-6
lines changed

4 files changed

+4
-6
lines changed

.gitmodules

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
[submodule "src/llvm"]
22
path = src/llvm
3-
url = https://github.com/alexcrichton/llvm.git
3+
url = https://github.com/luqmana/llvm.git
44
branch = master
55
[submodule "src/libuv"]
66
path = src/libuv

src/llvm

Submodule llvm updated 1023 files

src/rustllvm/PassWrapper.cpp

+1-3
Original file line numberDiff line numberDiff line change
@@ -81,9 +81,7 @@ LLVMRustCreateTargetMachine(const char *triple,
8181
TargetOptions Options;
8282
Options.NoFramePointerElim = true;
8383
Options.EnableSegmentedStacks = EnableSegmentedStacks;
84-
Options.FloatABIType =
85-
(Trip.getEnvironment() == Triple::GNUEABIHF) ? FloatABI::Hard :
86-
FloatABI::Default;
84+
Options.FloatABIType = FloatABI::Default;
8785
Options.UseSoftFloat = UseSoftFloat;
8886
if (UseSoftFloat) {
8987
Options.FloatABIType = FloatABI::Soft;

src/rustllvm/llvm-auto-clean-trigger

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
11
# If this file is modified, then llvm will be forcibly cleaned and then rebuilt.
22
# The actual contents of this file do not matter, but to trigger a change on the
33
# build bots then the contents should be changed so git updates the mtime.
4-
2013-12-18
4+
2013-12-29

0 commit comments

Comments
 (0)