From aee4420ed6f5172880a73a0f4b3a738baad1cdbb Mon Sep 17 00:00:00 2001 From: Jorge Aparicio Date: Tue, 9 Aug 2016 12:25:49 -0500 Subject: [PATCH 1/7] CI: test i586-unknown-linux-gnu --- .travis.yml | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/.travis.yml b/.travis.yml index c1b6dd4fb..45b3d03fb 100644 --- a/.travis.yml +++ b/.travis.yml @@ -42,6 +42,12 @@ matrix: packages: *armhf - env: TARGET=i686-apple-darwin os: osx + - env: TARGET=i586-unknown-linux-gnu + os: linux + addons: + apt: + packages: + - gcc-multilib - env: TARGET=i686-unknown-linux-gnu os: linux addons: From b0e5d13e2f805a5f2364c37852c43616b42f1100 Mon Sep 17 00:00:00 2001 From: Jorge Aparicio Date: Tue, 9 Aug 2016 12:43:37 -0500 Subject: [PATCH 2/7] use trusty --- .travis.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.travis.yml b/.travis.yml index 45b3d03fb..b3fd61d8a 100644 --- a/.travis.yml +++ b/.travis.yml @@ -44,6 +44,7 @@ matrix: os: osx - env: TARGET=i586-unknown-linux-gnu os: linux + dist: trusty addons: apt: packages: From 8c029ed1b4ea6ed80511d0457b895f01d3c541be Mon Sep 17 00:00:00 2001 From: Jorge Aparicio Date: Tue, 9 Aug 2016 15:37:24 -0500 Subject: [PATCH 3/7] use docker --- .travis.yml | 7 ++----- ci/env.sh | 7 ++++++- ci/install.sh | 4 ++++ 3 files changed, 12 insertions(+), 6 deletions(-) diff --git a/.travis.yml b/.travis.yml index b3fd61d8a..13e843e4d 100644 --- a/.travis.yml +++ b/.travis.yml @@ -44,11 +44,8 @@ matrix: os: osx - env: TARGET=i586-unknown-linux-gnu os: linux - dist: trusty - addons: - apt: - packages: - - gcc-multilib + services: docker + sudo: required - env: TARGET=i686-unknown-linux-gnu os: linux addons: diff --git a/ci/env.sh b/ci/env.sh index ee3bd163e..09b86f2f0 100644 --- a/ci/env.sh +++ b/ci/env.sh @@ -30,10 +30,15 @@ case $TARGET in export PREFIX=arm-linux-gnueabihf- export QEMU_LD_PREFIX=/usr/arm-linux-gnueabihf ;; + i586-unknown-linux-gnu) + # NOTE $DOCKER values: 'y' (yes, call docker), 'i' (inside a docker container) or 'n' ("no) + if [[ -z $DOCKER ]]; then + export DOCKER=y + fi + ;; mips-unknown-linux-gnu) # See #2 export DONT_RUN_TESTS=y - # NOTE $DOCKER values: 'y' (yes, call docker), 'i' (inside a docker container) or 'n' ("no) if [[ -z $DOCKER ]]; then export DOCKER=y fi diff --git a/ci/install.sh b/ci/install.sh index 82c4c59b3..c97a45dae 100644 --- a/ci/install.sh +++ b/ci/install.sh @@ -38,6 +38,10 @@ install_c_toolchain() { sudo apt-get install -y --no-install-recommends \ gcc-aarch64-linux-gnu libc6-dev-arm64-cross ;; + i586-unknown-linux-gnu) + apt-get install -y --no-install-recommends \ + gcc libc6-dev-i386 + ;; mips-unknown-linux-gnu) apt-get install -y --no-install-recommends \ gcc-mips-linux-gnu libc6-dev-mips-cross From ab8927ca576a7ba9e3587784ae9cf04ffc4e7e22 Mon Sep 17 00:00:00 2001 From: Jorge Aparicio Date: Tue, 9 Aug 2016 15:37:51 -0500 Subject: [PATCH 4/7] put the target first --- .travis.yml | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/.travis.yml b/.travis.yml index 13e843e4d..dae5b40b2 100644 --- a/.travis.yml +++ b/.travis.yml @@ -3,6 +3,10 @@ sudo: false matrix: include: + - env: TARGET=i586-unknown-linux-gnu + os: linux + services: docker + sudo: required - env: TARGET=aarch64-unknown-linux-gnu os: linux dist: trusty @@ -42,10 +46,6 @@ matrix: packages: *armhf - env: TARGET=i686-apple-darwin os: osx - - env: TARGET=i586-unknown-linux-gnu - os: linux - services: docker - sudo: required - env: TARGET=i686-unknown-linux-gnu os: linux addons: From aeb057cc572c0535da984d0cc181094c4d67c0d0 Mon Sep 17 00:00:00 2001 From: Jorge Aparicio Date: Tue, 9 Aug 2016 15:46:57 -0500 Subject: [PATCH 5/7] add libgcc --- ci/install.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ci/install.sh b/ci/install.sh index c97a45dae..e34433c89 100644 --- a/ci/install.sh +++ b/ci/install.sh @@ -40,7 +40,7 @@ install_c_toolchain() { ;; i586-unknown-linux-gnu) apt-get install -y --no-install-recommends \ - gcc libc6-dev-i386 + gcc libc6-dev-i386 libgcc1 ;; mips-unknown-linux-gnu) apt-get install -y --no-install-recommends \ From b409422782d84343e90e6bd62b45376f1c684508 Mon Sep 17 00:00:00 2001 From: Jorge Aparicio Date: Tue, 9 Aug 2016 15:55:25 -0500 Subject: [PATCH 6/7] 32-bit version of libgcc --- ci/install.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ci/install.sh b/ci/install.sh index e34433c89..8226e1784 100644 --- a/ci/install.sh +++ b/ci/install.sh @@ -40,7 +40,7 @@ install_c_toolchain() { ;; i586-unknown-linux-gnu) apt-get install -y --no-install-recommends \ - gcc libc6-dev-i386 libgcc1 + gcc libc6-dev-i386 lib32gcc1 ;; mips-unknown-linux-gnu) apt-get install -y --no-install-recommends \ From 93d2342318d4eb5d97242edcc3bc1abe70a1cb09 Mon Sep 17 00:00:00 2001 From: Jorge Aparicio Date: Tue, 9 Aug 2016 16:17:06 -0500 Subject: [PATCH 7/7] libgcc_s dev version --- ci/install.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ci/install.sh b/ci/install.sh index 8226e1784..9251f79a3 100644 --- a/ci/install.sh +++ b/ci/install.sh @@ -40,7 +40,7 @@ install_c_toolchain() { ;; i586-unknown-linux-gnu) apt-get install -y --no-install-recommends \ - gcc libc6-dev-i386 lib32gcc1 + gcc libc6-dev-i386 lib32gcc-5-dev ;; mips-unknown-linux-gnu) apt-get install -y --no-install-recommends \