diff options
| author | bors <bors@rust-lang.org> | 2018-04-21 16:18:22 +0000 |
|---|---|---|
| committer | bors <bors@rust-lang.org> | 2018-04-21 16:18:22 +0000 |
| commit | d2577ca1ec1449bd83d05e540c57447574ccaa28 (patch) | |
| tree | 326adc8536d278efca64310b699ce2e5fc7088b8 /src/test/codegen | |
| parent | 222551f3f3a26b9553c97c8e8b9ad15fdb7dc902 (diff) | |
| parent | f7439a5a4565b86b934610aafa9c69b9c53b672b (diff) | |
| download | rust-d2577ca1ec1449bd83d05e540c57447574ccaa28.tar.gz rust-d2577ca1ec1449bd83d05e540c57447574ccaa28.zip | |
Auto merge of #50093 - alexcrichton:android-uwtable, r=michaelwoerister
rustc: Always emit `uwtable` on Android Long ago (#40549) we enabled the `uwtable` attribute on Windows by default (even with `-C panic=abort`) to allow unwinding binaries for [stack unwinding information][winstack]. It looks like this same issue is [plaguing][arm1] Gecko's Android platforms [as well][arm2]. This commit applies the same fix as #40549 except that this time it's applied for all Android targets. Generating a `-C panic=abort` binary for `armv7-linux-androideabi` before this commit generated a number of `cantunwind` functions (detected with `readelf -u`) but after this commit they all list appropriate unwind information. Closes #49867 [winstack]: https://bugzilla.mozilla.org/show_bug.cgi?id=1302078 [arm1]: https://bugzilla.mozilla.org/show_bug.cgi?id=1453220 [arm2]: https://bugzilla.mozilla.org/show_bug.cgi?id=1451741
Diffstat (limited to 'src/test/codegen')
| -rw-r--r-- | src/test/codegen/nounwind.rs | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/src/test/codegen/nounwind.rs b/src/test/codegen/nounwind.rs index 9fea907d3c8..6863b1f2792 100644 --- a/src/test/codegen/nounwind.rs +++ b/src/test/codegen/nounwind.rs @@ -11,6 +11,7 @@ // aux-build:nounwind.rs // compile-flags: -C no-prepopulate-passes -C panic=abort -C metadata=a // ignore-windows +// ignore-android #![crate_type = "lib"] |