From 5d164a4edafbd32c575b6929c84200c817e2844a Mon Sep 17 00:00:00 2001
From: Jorge Aparicio <japaricious@gmail.com>
Date: Fri, 14 Oct 2016 09:59:21 -0500
Subject: [PATCH] fix the powerpc64le target

by selecting a CPU that's compatible with the instructions that `rustc`
generates
---
 ci/docker/powerpc64le-unknown-linux-gnu/Dockerfile |  1 +
 ci/run.sh                                          | 10 ++--------
 src/bin/intrinsics.rs                              |  2 +-
 3 files changed, 4 insertions(+), 9 deletions(-)

diff --git a/ci/docker/powerpc64le-unknown-linux-gnu/Dockerfile b/ci/docker/powerpc64le-unknown-linux-gnu/Dockerfile
index bd0a182..ba1b3c2 100644
--- a/ci/docker/powerpc64le-unknown-linux-gnu/Dockerfile
+++ b/ci/docker/powerpc64le-unknown-linux-gnu/Dockerfile
@@ -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
diff --git a/ci/run.sh b/ci/run.sh
index 3846049..0159e23 100755
--- a/ci/run.sh
+++ b/ci/run.sh
@@ -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
@@ -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)
diff --git a/src/bin/intrinsics.rs b/src/bin/intrinsics.rs
index db6d7d9..5a4a345 100644
--- a/src/bin/intrinsics.rs
+++ b/src/bin/intrinsics.rs
@@ -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).