diff options
| author | bors <bors@rust-lang.org> | 2016-08-01 04:47:48 -0700 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2016-08-01 04:47:48 -0700 |
| commit | 2c1612c62aa59e40cf1a4bddde943938e0147eec (patch) | |
| tree | 60f9b802b477dfc93aad9a97f9a7d07b83cc4eaa /src/librustc_back | |
| parent | 5ef1e7e0efe7129edbf06a699abaa6563e8cfc9e (diff) | |
| parent | 5d1d2475232d06b2a315d87481898819bb547f97 (diff) | |
| download | rust-2c1612c62aa59e40cf1a4bddde943938e0147eec.tar.gz rust-2c1612c62aa59e40cf1a4bddde943938e0147eec.zip | |
Auto merge of #34743 - badboy:llvm-upgrade, r=eddyb
LLVM upgrade As discussed in https://internals.rust-lang.org/t/need-help-with-emscripten-port/3154/46 I'm trying to update the used LLVM checkout in Rust. I basically took @shepmaster's code and applied it on top (though I did the commits manually, the [original commits have better descriptions](https://github.com/rust-lang/rust/compare/master...avr-rust:avr-support). With these changes I was able to build rustc. `make check` throws one last error on `run-pass/issue-28950.rs`. Output: https://gist.github.com/badboy/bcdd3bbde260860b6159aa49070a9052 I took the metadata changes as is and they seem to work, though it now uses the module in another step. I'm not sure if this is the best and correct way. Things to do: * [x] ~~Make `run-pass/issue-28950.rs` pass~~ unrelated * [x] Find out how the `PositionIndependentExecutable` setting is now used * [x] Is the `llvm::legacy` still the right way to do these things? cc @brson @alexcrichton
Diffstat (limited to 'src/librustc_back')
| -rw-r--r-- | src/librustc_back/target/aarch64_linux_android.rs | 2 | ||||
| -rw-r--r-- | src/librustc_back/target/aarch64_unknown_linux_gnu.rs | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/src/librustc_back/target/aarch64_linux_android.rs b/src/librustc_back/target/aarch64_linux_android.rs index 307823137a7..7f54dab5b53 100644 --- a/src/librustc_back/target/aarch64_linux_android.rs +++ b/src/librustc_back/target/aarch64_linux_android.rs @@ -20,7 +20,7 @@ pub fn target() -> TargetResult { llvm_target: "aarch64-linux-android".to_string(), target_endian: "little".to_string(), target_pointer_width: "64".to_string(), - data_layout: "e-m:e-i64:64-i128:128-n32:64-S128".to_string(), + data_layout: "e-m:e-i8:8:32-i16:16:32-i64:64-i128:128-n32:64-S128".to_string(), arch: "aarch64".to_string(), target_os: "android".to_string(), target_env: "".to_string(), diff --git a/src/librustc_back/target/aarch64_unknown_linux_gnu.rs b/src/librustc_back/target/aarch64_unknown_linux_gnu.rs index 14d0c8bedec..cca965f9d4f 100644 --- a/src/librustc_back/target/aarch64_unknown_linux_gnu.rs +++ b/src/librustc_back/target/aarch64_unknown_linux_gnu.rs @@ -18,7 +18,7 @@ pub fn target() -> TargetResult { target_endian: "little".to_string(), target_pointer_width: "64".to_string(), target_env: "gnu".to_string(), - data_layout: "e-m:e-i64:64-i128:128-n32:64-S128".to_string(), + data_layout: "e-m:e-i8:8:32-i16:16:32-i64:64-i128:128-n32:64-S128".to_string(), arch: "aarch64".to_string(), target_os: "linux".to_string(), target_vendor: "unknown".to_string(), |