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/test/run-pass | |
| parent | 5ef1e7e0efe7129edbf06a699abaa6563e8cfc9e (diff) | |
| parent | 5d1d2475232d06b2a315d87481898819bb547f97 (diff) | |
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/test/run-pass')
| -rw-r--r-- | src/test/run-pass/backtrace.rs | 14 |
1 files changed, 1 insertions, 13 deletions
diff --git a/src/test/run-pass/backtrace.rs b/src/test/run-pass/backtrace.rs index ad38dc8f452..f1ce17c0736 100644 --- a/src/test/run-pass/backtrace.rs +++ b/src/test/run-pass/backtrace.rs @@ -46,19 +46,7 @@ fn template(me: &str) -> Command { } fn expected(fn_name: &str) -> String { - // FIXME(#32481) - // - // On windows, we read the function name from debuginfo using some - // system APIs. For whatever reason, these APIs seem to use the - // "name" field, which is only the "relative" name, not the full - // name with namespace info, so we just see `foo` and not - // `backtrace::foo` as we see on linux (which uses the linkage - // name). - if cfg!(windows) && cfg!(target_env = "msvc") { - format!(" - {}", fn_name) - } else { - format!(" - backtrace::{}", fn_name) - } + format!(" - backtrace::{}", fn_name) } fn runtest(me: &str) { |