diff options
| author | bors <bors@rust-lang.org> | 2015-01-15 05:12:30 +0000 |
|---|---|---|
| committer | bors <bors@rust-lang.org> | 2015-01-15 05:12:30 +0000 |
| commit | 0c96037ec1676b420002a06ea337865f95abbf2c (patch) | |
| tree | cec4f5e86bd892800d343105da4332ad94b3f61a /src/liballoc | |
| parent | 451e134c180e88b06e3b747ed750e4901ca93721 (diff) | |
| parent | 78278d0c76f3c868a4a4bcc47336c384968c6b3a (diff) | |
| download | rust-0c96037ec1676b420002a06ea337865f95abbf2c.tar.gz rust-0c96037ec1676b420002a06ea337865f95abbf2c.zip | |
auto merge of #20980 : richo/rust/final-power, r=alexcrichton
Originally, this was going to be discussed and revisted, however I've been working on this for months, and a rebase on top of master was about 1 flight's worth of work so I just went ahead and did it.
This gets you as far as being able to target powerpc with, eg:
LD_LIBRARY_PATH=./x86_64-unknown-linux-gnu/stage2/lib/ x86_64-unknown-linux-gnu/stage2/bin/rustc -C linker=powerpc-linux-gnu-gcc --target powerpc-unknown-linux-gnu hello.rs
Would really love to get this out before 1.0. r? @alexcrichton
Diffstat (limited to 'src/liballoc')
| -rw-r--r-- | src/liballoc/heap.rs | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/src/liballoc/heap.rs b/src/liballoc/heap.rs index 02933c763ef..b7bc1b47646 100644 --- a/src/liballoc/heap.rs +++ b/src/liballoc/heap.rs @@ -119,7 +119,8 @@ unsafe fn exchange_free(ptr: *mut u8, old_size: uint, align: uint) { not(feature = "external_crate"), any(target_arch = "arm", target_arch = "mips", - target_arch = "mipsel")))] + target_arch = "mipsel", + target_arch = "powerpc")))] const MIN_ALIGN: uint = 8; #[cfg(all(not(feature = "external_funcs"), not(feature = "external_crate"), |