Merge pull request #38 from japaric/ppc64le

try 32-bit qemu for ppc64le
This commit is contained in:
Jorge Aparicio 2016-08-13 20:24:35 -05:00 committed by GitHub
commit 18c2894f64
3 changed files with 5 additions and 8 deletions

View File

@ -5,6 +5,8 @@ sudo: required
matrix: matrix:
include: include:
- env: TARGET=powerpc64le-unknown-linux-gnu
os: linux
- env: TARGET=aarch64-unknown-linux-gnu - env: TARGET=aarch64-unknown-linux-gnu
os: linux os: linux
- env: TARGET=arm-unknown-linux-gnueabi - env: TARGET=arm-unknown-linux-gnueabi
@ -27,8 +29,6 @@ matrix:
os: linux os: linux
- env: TARGET=powerpc64-unknown-linux-gnu - env: TARGET=powerpc64-unknown-linux-gnu
os: linux os: linux
- env: TARGET=powerpc64le-unknown-linux-gnu
os: linux
- env: TARGET=thumbv6m-none-eabi - env: TARGET=thumbv6m-none-eabi
os: linux os: linux
- env: TARGET=thumbv7em-none-eabi - env: TARGET=thumbv7em-none-eabi

View File

@ -47,6 +47,8 @@ case $TARGET in
powerpc64le-unknown-linux-gnu) powerpc64le-unknown-linux-gnu)
export PREFIX=powerpc64le-linux-gnu- export PREFIX=powerpc64le-linux-gnu-
export QEMU_LD_PREFIX=/usr/powerpc64le-linux-gnu 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 export RUN_TESTS=n
;; ;;
thumbv*-none-eabi) thumbv*-none-eabi)

View File

@ -3,12 +3,7 @@ set -ex
. $(dirname $0)/env.sh . $(dirname $0)/env.sh
install_qemu() { install_qemu() {
case ${QEMU_ARCH:-$TRAVIS_OS_NAME} in case $TRAVIS_OS_NAME in
i386)
dpkg --add-architecture $QEMU_ARCH
apt-get install -y --no-install-recommends \
binfmt-support qemu-user-static:$QEMU_ARCH
;;
linux) linux)
apt-get update apt-get update
apt-get install -y --no-install-recommends \ apt-get install -y --no-install-recommends \