Skip to content

Commit ef08913

Browse files
author
Jorge Aparicio
authored
Merge pull request #99 from japaric/ppc64le
fix the powerpc64le target
2 parents f6b5c56 + 5d164a4 commit ef08913

File tree

3 files changed

+4
-9
lines changed

3 files changed

+4
-9
lines changed

ci/docker/powerpc64le-unknown-linux-gnu/Dockerfile

+1
Original file line numberDiff line numberDiff line change
@@ -7,5 +7,6 @@ RUN apt-get install -y --no-install-recommends \
77
qemu-system-ppc
88

99
ENV CARGO_TARGET_POWERPC64LE_UNKNOWN_LINUX_GNU_LINKER=powerpc64le-linux-gnu-gcc \
10+
QEMU_CPU=POWER8 \
1011
QEMU_LD_PREFIX=/usr/powerpc64le-linux-gnu \
1112
RUST_TEST_THREADS=1

ci/run.sh

+2-8
Original file line numberDiff line numberDiff line change
@@ -6,12 +6,6 @@ case $1 in
66
xargo build --target $1
77
xargo build --target $1 --release
88
;;
9-
# QEMU crashes even when executing the simplest cross compiled C program:
10-
# `int main() { return 0; }`
11-
powerpc64le-unknown-linux-gnu)
12-
cargo test --target $1 --no-run
13-
cargo test --target $1 --no-run --release
14-
;;
159
*)
1610
cargo test --target $1
1711
cargo test --target $1 --release
@@ -69,9 +63,9 @@ esac
6963

7064
# NOTE On i586, It's normal that the get_pc_thunk symbol appears several times so ignore it
7165
if [ $TRAVIS_OS_NAME = osx ]; then
72-
path=target/${1}/debug/librustc_builtins.rlib
66+
path=target/${1}/debug/libcompiler_builtins.rlib
7367
else
74-
path=/target/${1}/debug/librustc_builtins.rlib
68+
path=/target/${1}/debug/libcompiler_builtins.rlib
7569
fi
7670

7771
stdout=$($PREFIX$NM -g --defined-only $path)

src/bin/intrinsics.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
// By compiling this file we check that all the intrinsics we care about continue to be provided by
2-
// the `rustc_builtins` crate regardless of the changes we make to it. If we, by mistake, stop
2+
// the `compiler_builtins` crate regardless of the changes we make to it. If we, by mistake, stop
33
// compiling a C implementation and forget to implement that intrinsic in Rust, this file will fail
44
// to link due to the missing intrinsic (symbol).
55

0 commit comments

Comments
 (0)