diff options
| author | bors <bors@rust-lang.org> | 2013-12-29 21:51:56 -0800 |
|---|---|---|
| committer | bors <bors@rust-lang.org> | 2013-12-29 21:51:56 -0800 |
| commit | 0cbb44aff9a9840c133ea454db7d302c247d5f0f (patch) | |
| tree | 25f3a313a2eded212b0bf90890c0ef130265f11d | |
| parent | b5b570b6bef934fc585f3f9d927484c2307da20b (diff) | |
| parent | d9eaeda21cce08a7e8d3c8d76433650520fec765 (diff) | |
| download | rust-0cbb44aff9a9840c133ea454db7d302c247d5f0f.tar.gz rust-0cbb44aff9a9840c133ea454db7d302c247d5f0f.zip | |
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.
| -rw-r--r-- | .gitmodules | 2 | ||||
| m--------- | src/llvm | 0 | ||||
| -rw-r--r-- | src/rustllvm/PassWrapper.cpp | 4 | ||||
| -rw-r--r-- | src/rustllvm/llvm-auto-clean-trigger | 2 |
4 files changed, 3 insertions, 5 deletions
diff --git a/.gitmodules b/.gitmodules index 76bdab1e642..43169be1950 100644 --- a/.gitmodules +++ b/.gitmodules @@ -1,6 +1,6 @@ [submodule "src/llvm"] path = src/llvm - url = https://github.com/alexcrichton/llvm.git + url = https://github.com/luqmana/llvm.git branch = master [submodule "src/libuv"] path = src/libuv diff --git a/src/llvm b/src/llvm -Subproject eac6ff795c40778683e42b0c6ab6f6adaceb391 +Subproject 8841dcef357e051c34a46030db7c7b1a83f9b1d diff --git a/src/rustllvm/PassWrapper.cpp b/src/rustllvm/PassWrapper.cpp index 4ac341a12e4..cab9c187eae 100644 --- a/src/rustllvm/PassWrapper.cpp +++ b/src/rustllvm/PassWrapper.cpp @@ -81,9 +81,7 @@ LLVMRustCreateTargetMachine(const char *triple, TargetOptions Options; Options.NoFramePointerElim = true; Options.EnableSegmentedStacks = EnableSegmentedStacks; - Options.FloatABIType = - (Trip.getEnvironment() == Triple::GNUEABIHF) ? FloatABI::Hard : - FloatABI::Default; + Options.FloatABIType = FloatABI::Default; Options.UseSoftFloat = UseSoftFloat; if (UseSoftFloat) { Options.FloatABIType = FloatABI::Soft; diff --git a/src/rustllvm/llvm-auto-clean-trigger b/src/rustllvm/llvm-auto-clean-trigger index 14dfc92097a..95b950973d1 100644 --- a/src/rustllvm/llvm-auto-clean-trigger +++ b/src/rustllvm/llvm-auto-clean-trigger @@ -1,4 +1,4 @@ # 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 # build bots then the contents should be changed so git updates the mtime. -2013-12-18 +2013-12-29 |