diff options
| author | bors <bors@rust-lang.org> | 2019-07-25 02:04:55 +0000 |
|---|---|---|
| committer | bors <bors@rust-lang.org> | 2019-07-25 02:04:55 +0000 |
| commit | 185b9acb66438894596f3c40d2ae4c6f7deeb8ab (patch) | |
| tree | a032ed1d213b8f195cee010fb1d43d6623bb2f37 /src/libstd/sys_common | |
| parent | 03f19f7ff128a3b01eeab3f87f04cce22883f006 (diff) | |
| parent | 0340d72bf5bd8a740d46dee7325b69565b96af52 (diff) | |
| download | rust-185b9acb66438894596f3c40d2ae4c6f7deeb8ab.tar.gz rust-185b9acb66438894596f3c40d2ae4c6f7deeb8ab.zip | |
Auto merge of #62961 - Centril:rollup-kydeswa, r=Centril
Rollup of 9 pull requests Successful merges: - #61727 (Add binary dependencies to dep-info files) - #62736 (Polonius: fix some cases of `killed` fact generation, and most of the `ui` test suite) - #62758 (ci: Install clang on Windows through tarballs) - #62784 (Add riscv32i-unknown-none-elf target) - #62814 (add support for hexagon-unknown-linux-musl) - #62827 (Don't link mcjit/interpreter LLVM components) - #62901 (cleanup: Remove `extern crate serialize as rustc_serialize`s) - #62903 (Support SDKROOT env var on iOS) - #62906 (Require a value for configure --debuginfo-level) Failed merges: - #62910 (cleanup: Remove lint annotations in specific crates that are already enforced by rustbuild) r? @ghost
Diffstat (limited to 'src/libstd/sys_common')
| -rw-r--r-- | src/libstd/sys_common/alloc.rs | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/src/libstd/sys_common/alloc.rs b/src/libstd/sys_common/alloc.rs index 978a70bee09..1cfc7ed17f2 100644 --- a/src/libstd/sys_common/alloc.rs +++ b/src/libstd/sys_common/alloc.rs @@ -12,7 +12,8 @@ use crate::ptr; target_arch = "powerpc", target_arch = "powerpc64", target_arch = "asmjs", - target_arch = "wasm32")))] + target_arch = "wasm32", + target_arch = "hexagon")))] pub const MIN_ALIGN: usize = 8; #[cfg(all(any(target_arch = "x86_64", target_arch = "aarch64", |