Skip to content

fix the powerpc64le target #99

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Oct 14, 2016
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions ci/docker/powerpc64le-unknown-linux-gnu/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -7,5 +7,6 @@ RUN apt-get install -y --no-install-recommends \
qemu-system-ppc

ENV CARGO_TARGET_POWERPC64LE_UNKNOWN_LINUX_GNU_LINKER=powerpc64le-linux-gnu-gcc \
QEMU_CPU=POWER8 \
QEMU_LD_PREFIX=/usr/powerpc64le-linux-gnu \
RUST_TEST_THREADS=1
10 changes: 2 additions & 8 deletions ci/run.sh
Original file line number Diff line number Diff line change
Expand Up @@ -6,12 +6,6 @@ case $1 in
xargo build --target $1
xargo build --target $1 --release
;;
# QEMU crashes even when executing the simplest cross compiled C program:
# `int main() { return 0; }`
powerpc64le-unknown-linux-gnu)
cargo test --target $1 --no-run
cargo test --target $1 --no-run --release
;;
*)
cargo test --target $1
cargo test --target $1 --release
Expand Down Expand Up @@ -69,9 +63,9 @@ esac

# NOTE On i586, It's normal that the get_pc_thunk symbol appears several times so ignore it
if [ $TRAVIS_OS_NAME = osx ]; then
path=target/${1}/debug/librustc_builtins.rlib
path=target/${1}/debug/libcompiler_builtins.rlib
else
path=/target/${1}/debug/librustc_builtins.rlib
path=/target/${1}/debug/libcompiler_builtins.rlib
fi

stdout=$($PREFIX$NM -g --defined-only $path)
Expand Down
2 changes: 1 addition & 1 deletion src/bin/intrinsics.rs
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
// By compiling this file we check that all the intrinsics we care about continue to be provided by
// the `rustc_builtins` crate regardless of the changes we make to it. If we, by mistake, stop
// the `compiler_builtins` crate regardless of the changes we make to it. If we, by mistake, stop
// compiling a C implementation and forget to implement that intrinsic in Rust, this file will fail
// to link due to the missing intrinsic (symbol).

Expand Down