OpenE2K/rust
2
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

auto merge of #11181 : luqmana/rust/up-llvm, r=alexcrichton

Browse Source 
No longer need to handle GNUEABIHF and hard floats since LLVM should now choose the right default. Fixes #11164.
This commit is contained in:
bors 2013-12-29 21:51:56 -08:00
commit 0cbb44aff9
4 changed files with 4 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
.gitmodules vendored
View File

@ -1,6 +1,6 @@
[submodule "src/llvm"] [submodule "src/llvm"]
path = src/llvm path = src/llvm
url = https://github.com/alexcrichton/llvm.git url = https://github.com/luqmana/llvm.git
branch = master branch = master
[submodule "src/libuv"] [submodule "src/libuv"]
path = src/libuv path = src/libuv

2
src/llvm

@ -1 +1 @@
Subproject commit eac6ff795c40778683e42b0c6ab6f6adaceb391d Subproject commit 8841dcef357e051c34a46030db7c7b1a83f9b1d8

4
src/rustllvm/PassWrapper.cpp
View File

@ -81,9 +81,7 @@ LLVMRustCreateTargetMachine(const char *triple,
TargetOptions Options; TargetOptions Options;
Options.NoFramePointerElim = true; Options.NoFramePointerElim = true;
Options.EnableSegmentedStacks = EnableSegmentedStacks; Options.EnableSegmentedStacks = EnableSegmentedStacks;
Options.FloatABIType = Options.FloatABIType = FloatABI::Default;
(Trip.getEnvironment() == Triple::GNUEABIHF) ? FloatABI::Hard :
FloatABI::Default;
Options.UseSoftFloat = UseSoftFloat; Options.UseSoftFloat = UseSoftFloat;
if (UseSoftFloat) { if (UseSoftFloat) {
Options.FloatABIType = FloatABI::Soft; Options.FloatABIType = FloatABI::Soft;

2
src/rustllvm/llvm-auto-clean-trigger
View File

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