From 18265c1061c65001c5b558af604f342b97a986f6 Mon Sep 17 00:00:00 2001
From: Jorge Aparicio <japaricious@gmail.com>
Date: Sat, 13 Aug 2016 18:58:41 -0500
Subject: [PATCH 1/3] try 32-bit qemu for ppc64le

---
 library/compiler-builtins/.travis.yml | 4 ++--
 library/compiler-builtins/ci/env.sh   | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/library/compiler-builtins/.travis.yml b/library/compiler-builtins/.travis.yml
index e74b68002ffa..7259cc0b11f1 100644
--- a/library/compiler-builtins/.travis.yml
+++ b/library/compiler-builtins/.travis.yml
@@ -5,6 +5,8 @@ sudo: required
 
 matrix:
   include:
+    - env: TARGET=powerpc64le-unknown-linux-gnu
+      os: linux
     - env: TARGET=aarch64-unknown-linux-gnu
       os: linux
     - env: TARGET=arm-unknown-linux-gnueabi
@@ -27,8 +29,6 @@ matrix:
       os: linux
     - env: TARGET=powerpc64-unknown-linux-gnu
       os: linux
-    - env: TARGET=powerpc64le-unknown-linux-gnu
-      os: linux
     - env: TARGET=thumbv6m-none-eabi
       os: linux
     - env: TARGET=thumbv7em-none-eabi
diff --git a/library/compiler-builtins/ci/env.sh b/library/compiler-builtins/ci/env.sh
index 50f19b2781fd..bb1bd262549f 100644
--- a/library/compiler-builtins/ci/env.sh
+++ b/library/compiler-builtins/ci/env.sh
@@ -46,8 +46,8 @@ case $TARGET in
         ;;
     powerpc64le-unknown-linux-gnu)
         export PREFIX=powerpc64le-linux-gnu-
+        export QEMU_ARCH=i386
         export QEMU_LD_PREFIX=/usr/powerpc64le-linux-gnu
-        export RUN_TESTS=n
         ;;
     thumbv*-none-eabi)
         export CARGO=xargo

From 2d84d8acd40d75ccdc12889d3c423b3cec6d1449 Mon Sep 17 00:00:00 2001
From: Jorge Aparicio <japaricious@gmail.com>
Date: Sat, 13 Aug 2016 19:30:30 -0500
Subject: [PATCH 2/3] add missing apt-get update

---
 library/compiler-builtins/ci/install.sh | 1 +
 1 file changed, 1 insertion(+)

diff --git a/library/compiler-builtins/ci/install.sh b/library/compiler-builtins/ci/install.sh
index bdb0fa1d77a0..6e527b5c3cf5 100644
--- a/library/compiler-builtins/ci/install.sh
+++ b/library/compiler-builtins/ci/install.sh
@@ -6,6 +6,7 @@ install_qemu() {
     case ${QEMU_ARCH:-$TRAVIS_OS_NAME} in
         i386)
             dpkg --add-architecture $QEMU_ARCH
+            apt-get update
             apt-get install -y --no-install-recommends \
                     binfmt-support qemu-user-static:$QEMU_ARCH
             ;;

From 44aa941787d632bf5364300e689716f519386424 Mon Sep 17 00:00:00 2001
From: Jorge Aparicio <japaricious@gmail.com>
Date: Sat, 13 Aug 2016 19:56:34 -0500
Subject: [PATCH 3/3] disable tests for ppc64le, drop logic around QEMU_ARCH

---
 library/compiler-builtins/ci/env.sh     | 4 +++-
 library/compiler-builtins/ci/install.sh | 8 +-------
 2 files changed, 4 insertions(+), 8 deletions(-)

diff --git a/library/compiler-builtins/ci/env.sh b/library/compiler-builtins/ci/env.sh
index bb1bd262549f..55249950b3c2 100644
--- a/library/compiler-builtins/ci/env.sh
+++ b/library/compiler-builtins/ci/env.sh
@@ -46,8 +46,10 @@ case $TARGET in
         ;;
     powerpc64le-unknown-linux-gnu)
         export PREFIX=powerpc64le-linux-gnu-
-        export QEMU_ARCH=i386
         export QEMU_LD_PREFIX=/usr/powerpc64le-linux-gnu
+        # QEMU crashes, even running the simplest cross compiled C program:
+        # `int main() { return 0; }`
+        export RUN_TESTS=n
         ;;
     thumbv*-none-eabi)
         export CARGO=xargo
diff --git a/library/compiler-builtins/ci/install.sh b/library/compiler-builtins/ci/install.sh
index 6e527b5c3cf5..db862cc33490 100644
--- a/library/compiler-builtins/ci/install.sh
+++ b/library/compiler-builtins/ci/install.sh
@@ -3,13 +3,7 @@ set -ex
 . $(dirname $0)/env.sh
 
 install_qemu() {
-    case ${QEMU_ARCH:-$TRAVIS_OS_NAME} in
-        i386)
-            dpkg --add-architecture $QEMU_ARCH
-            apt-get update
-            apt-get install -y --no-install-recommends \
-                    binfmt-support qemu-user-static:$QEMU_ARCH
-            ;;
+    case $TRAVIS_OS_NAME in
         linux)
             apt-get update
             apt-get install -y --no-install-recommends \