Skip to content

Commit 04e7fec

Browse files
homunkulushomunkulus
committed
Auto merge of #157 - gnzlbg:i586, r=<try>
add support for i586-unknown-linux-gnu Closes #156 .
2 parents 11504da + 7f3bfb6 commit 04e7fec

File tree

5 files changed

+77
-42
lines changed

5 files changed

+77
-42
lines changed

‎.travis.yml

Lines changed: 43 additions & 42 deletions
Original file line numberDiff line numberDiff line change
@@ -7,64 +7,65 @@ sudo: required
77
matrix:
88
include:
99
# Linux
10-
- env: TARGET=aarch64-unknown-linux-gnu CPP=1 DYLIB=1 STD=1 OPENSSL=0.5.5 RUN=1
11-
- env: TARGET=arm-unknown-linux-gnueabi CPP=1 DYLIB=1 STD=1 OPENSSL=0.5.5 RUN=1
12-
- env: TARGET=arm-unknown-linux-musleabi STD=1 RUN=1
13-
- env: TARGET=armv7-unknown-linux-gnueabihf CPP=1 DYLIB=1 STD=1 OPENSSL=0.5.5 RUN=1
14-
- env: TARGET=armv7-unknown-linux-musleabihf STD=1 RUN=1
15-
- env: TARGET=i686-unknown-linux-gnu CPP=1 DYLIB=1 STD=1 OPENSSL=0.5.5 RUN=1
16-
- env: TARGET=i686-unknown-linux-musl STD=1 OPENSSL=0.5.5 RUN=1
17-
- env: TARGET=mips-unknown-linux-gnu CPP=1 DYLIB=1 STD=1 OPENSSL=0.5.5 RUN=1
18-
- env: TARGET=mips64-unknown-linux-gnuabi64 CPP=1 DYLIB=1 STD=1 OPENSSL=0.7.17 RUN=1
19-
- env: TARGET=mips64el-unknown-linux-gnuabi64 CPP=1 DYLIB=1 STD=1 OPENSSL=0.7.17 RUN=1
20-
- env: TARGET=mipsel-unknown-linux-gnu CPP=1 DYLIB=1 STD=1 OPENSSL=0.5.5 RUN=1
21-
- env: TARGET=powerpc-unknown-linux-gnu CPP=1 DYLIB=1 STD=1 OPENSSL=0.5.5 RUN=1
22-
- env: TARGET=powerpc64-unknown-linux-gnu CPP=1 DYLIB=1 STD=1 OPENSSL=0.7.17 RUN=1
23-
- env: TARGET=powerpc64le-unknown-linux-gnu CPP=1 DYLIB=1 STD=1 OPENSSL=0.7.17 RUN=1
24-
- env: TARGET=s390x-unknown-linux-gnu CPP=1 DYLIB=1 STD=1 OPENSSL=0.7.17
25-
- env: TARGET=sparc64-unknown-linux-gnu CPP=1 DYLIB=1 OPENSSL=0.5.5 RUN=1
26-
- env: TARGET=x86_64-unknown-linux-gnu CPP=1 DYLIB=1 OPENSSL=0.5.5 RUN=1 DEPLOY=1
27-
- env: TARGET=x86_64-unknown-linux-musl STD=1 OPENSSL=0.5.5 RUN=1 DEPLOY=1
10+
# - env: TARGET=aarch64-unknown-linux-gnu CPP=1 DYLIB=1 STD=1 OPENSSL=0.5.5 RUN=1
11+
# - env: TARGET=arm-unknown-linux-gnueabi CPP=1 DYLIB=1 STD=1 OPENSSL=0.5.5 RUN=1
12+
# - env: TARGET=arm-unknown-linux-musleabi STD=1 RUN=1
13+
# - env: TARGET=armv7-unknown-linux-gnueabihf CPP=1 DYLIB=1 STD=1 OPENSSL=0.5.5 RUN=1
14+
# - env: TARGET=armv7-unknown-linux-musleabihf STD=1 RUN=1
15+
- env: TARGET=i586-unknown-linux-gnu CPP=1 DYLIB=1 STD=1 OPENSSL=0.5.5 RUN=1
16+
# - env: TARGET=i686-unknown-linux-gnu CPP=1 DYLIB=1 STD=1 OPENSSL=0.5.5 RUN=1
17+
# - env: TARGET=i686-unknown-linux-musl STD=1 OPENSSL=0.5.5 RUN=1
18+
# - env: TARGET=mips-unknown-linux-gnu CPP=1 DYLIB=1 STD=1 OPENSSL=0.5.5 RUN=1
19+
# - env: TARGET=mips64-unknown-linux-gnuabi64 CPP=1 DYLIB=1 STD=1 OPENSSL=0.7.17 RUN=1
20+
# - env: TARGET=mips64el-unknown-linux-gnuabi64 CPP=1 DYLIB=1 STD=1 OPENSSL=0.7.17 RUN=1
21+
# - env: TARGET=mipsel-unknown-linux-gnu CPP=1 DYLIB=1 STD=1 OPENSSL=0.5.5 RUN=1
22+
# - env: TARGET=powerpc-unknown-linux-gnu CPP=1 DYLIB=1 STD=1 OPENSSL=0.5.5 RUN=1
23+
# - env: TARGET=powerpc64-unknown-linux-gnu CPP=1 DYLIB=1 STD=1 OPENSSL=0.7.17 RUN=1
24+
# - env: TARGET=powerpc64le-unknown-linux-gnu CPP=1 DYLIB=1 STD=1 OPENSSL=0.7.17 RUN=1
25+
# - env: TARGET=s390x-unknown-linux-gnu CPP=1 DYLIB=1 STD=1 OPENSSL=0.7.17
26+
# - env: TARGET=sparc64-unknown-linux-gnu CPP=1 DYLIB=1 OPENSSL=0.5.5 RUN=1
27+
# - env: TARGET=x86_64-unknown-linux-gnu CPP=1 DYLIB=1 OPENSSL=0.5.5 RUN=1 DEPLOY=1
28+
# - env: TARGET=x86_64-unknown-linux-musl STD=1 OPENSSL=0.5.5 RUN=1 DEPLOY=1
2829

2930
# Android
30-
- env: TARGET=aarch64-linux-android CPP=1 STD=1 OPENSSL=0.5.5 RUN=1
31-
- env: TARGET=arm-linux-androideabi CPP=1 STD=1 OPENSSL=0.5.5 RUN=1
32-
- env: TARGET=armv7-linux-androideabi CPP=1 STD=1 OPENSSL=0.5.5 RUN=1
31+
# - env: TARGET=aarch64-linux-android CPP=1 STD=1 OPENSSL=0.5.5 RUN=1
32+
# - env: TARGET=arm-linux-androideabi CPP=1 STD=1 OPENSSL=0.5.5 RUN=1
33+
# - env: TARGET=armv7-linux-androideabi CPP=1 STD=1 OPENSSL=0.5.5 RUN=1
3334
# NOTE RUN=1 missing due to issue #143
34-
- env: TARGET=i686-linux-android CPP=1 STD=1 OPENSSL=0.5.5
35-
- env: TARGET=x86_64-linux-android CPP=1 STD=1 OPENSSL=0.5.5 RUN=1
35+
# - env: TARGET=i686-linux-android CPP=1 STD=1 OPENSSL=0.5.5
36+
# - env: TARGET=x86_64-linux-android CPP=1 STD=1 OPENSSL=0.5.5 RUN=1
3637

3738
# OSX
38-
- env: TARGET=i686-apple-darwin DYLIB=1 STD=1 RUN=1
39-
os: osx
40-
- env: TARGET=x86_64-apple-darwin DYLIB=1 STD=1 RUN=1 DEPLOY=1
41-
os: osx
39+
# - env: TARGET=i686-apple-darwin DYLIB=1 STD=1 RUN=1
40+
# os: osx
41+
# - env: TARGET=x86_64-apple-darwin DYLIB=1 STD=1 RUN=1 DEPLOY=1
42+
# os: osx
4243

4344
# BSD
44-
- env: TARGET=i686-unknown-freebsd DYLIB=1 STD=1 OPENSSL=0.7.17
45-
- env: TARGET=x86_64-unknown-dragonfly DYLIB=1 OPENSSL=0.5.5
46-
- env: TARGET=x86_64-unknown-freebsd DYLIB=1 STD=1 OPENSSL=0.5.5
47-
- env: TARGET=x86_64-unknown-netbsd DYLIB=1 STD=1 OPENSSL=0.7.17
45+
# - env: TARGET=i686-unknown-freebsd DYLIB=1 STD=1 OPENSSL=0.7.17
46+
# - env: TARGET=x86_64-unknown-dragonfly DYLIB=1 OPENSSL=0.5.5
47+
# - env: TARGET=x86_64-unknown-freebsd DYLIB=1 STD=1 OPENSSL=0.5.5
48+
# - env: TARGET=x86_64-unknown-netbsd DYLIB=1 STD=1 OPENSSL=0.7.17
4849

4950
# Solaris
50-
- env: TARGET=sparcv9-sun-solaris DYLIB=1 STD=1 OPENSSL=0.7.17
51-
- env: TARGET=x86_64-sun-solaris DYLIB=1 STD=1 OPENSSL=0.7.17
51+
# - env: TARGET=sparcv9-sun-solaris DYLIB=1 STD=1 OPENSSL=0.7.17
52+
# - env: TARGET=x86_64-sun-solaris DYLIB=1 STD=1 OPENSSL=0.7.17
5253

5354
# Windows
54-
- env: TARGET=x86_64-pc-windows-gnu CPP=1 STD=1 RUN=1
55-
- env: TARGET=i686-pc-windows-gnu CPP=1 STD=1 RUN=1
55+
# - env: TARGET=x86_64-pc-windows-gnu CPP=1 STD=1 RUN=1
56+
# - env: TARGET=i686-pc-windows-gnu CPP=1 STD=1 RUN=1
5657

5758
# Emscripten
58-
- env: TARGET=asmjs-unknown-emscripten CPP=1 STD=1 RUN=1
59-
- env: TARGET=wasm32-unknown-emscripten CPP=1 STD=1 RUN=1
59+
# - env: TARGET=asmjs-unknown-emscripten CPP=1 STD=1 RUN=1
60+
# - env: TARGET=wasm32-unknown-emscripten CPP=1 STD=1 RUN=1
6061
# work around rust-lang/cargo#4689
61-
rust: nightly-2017-10-24
62+
# rust: nightly-2017-10-24
6263

6364
# Bare metal
64-
- env: TARGET=thumbv6m-none-eabi RUN=1
65-
- env: TARGET=thumbv7em-none-eabi RUN=1
66-
- env: TARGET=thumbv7em-none-eabihf RUN=1
67-
- env: TARGET=thumbv7m-none-eabi RUN=1
65+
# - env: TARGET=thumbv6m-none-eabi RUN=1
66+
# - env: TARGET=thumbv7em-none-eabi RUN=1
67+
# - env: TARGET=thumbv7em-none-eabihf RUN=1
68+
# - env: TARGET=thumbv7m-none-eabi RUN=1
6869

6970
install:
7071
- curl https://sh.rustup.rs -sSf |

‎CHANGELOG.md

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,8 @@ This project adheres to [Semantic Versioning](http://semver.org/).
55

66
## [Unreleased]
77

8+
- Add support for the `i586-unknown-linux-gnu` target.
9+
810
## [v0.1.13] - 2017-11-08
911

1012
### Added

‎README.md

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -198,6 +198,7 @@ worst, "hang" (never terminate).
198198
| `armv7-unknown-linux-gnueabihf` | 2.15 | 4.6.2 | 1.0.2m | ✓ | 2.8.0 | ✓ |
199199
| `armv7-unknown-linux-musleabihf` | 1.1.15 | 5.3.1 | N/A | | 2.8.0 | ✓ |
200200
| `asmjs-unknown-emscripten` [4] | 1.1.15 | 1.37.13 | N/A | ✓ | N/A | ✓ |
201+
| `i586-unknown-linux-gnu` | 2.15 | 4.6.2 | 1.0.2m | ✓ | N/A | ✓ |
201202
| `i686-linux-android` [5] | N/A | 4.9 | 1.0.2m | ✓ | N/A | ✓ |
202203
| `i686-pc-windows-gnu` | N/A | 6.2.0 | N/A | ✓ | N/A | ✓ |
203204
| `i686-unknown-freebsd` [1] | 10.2 | 5.3.0 | 1.0.2m | | N/A | |

‎docker/i586-unknown-linux-gnu/Dockerfile

Lines changed: 26 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,26 @@
1+
FROM ubuntu:16.04
2+
3+
RUN apt-get update && \
4+
apt-get install -y --no-install-recommends \
5+
ca-certificates \
6+
cmake \
7+
gcc \
8+
libc6-dev \
9+
make \
10+
pkg-config
11+
12+
COPY xargo.sh /
13+
RUN bash /xargo.sh
14+
15+
COPY cmake.sh /
16+
RUN apt-get purge --auto-remove -y cmake && \
17+
bash /cmake.sh 2.8.11
18+
19+
COPY openssl.sh /
20+
RUN apt-get install -y --no-install-recommends \
21+
g++-multilib && \
22+
bash /openssl.sh linux-elf "" -m32
23+
24+
ENV OPENSSL_DIR=/openssl \
25+
OPENSSL_INCLUDE_DIR=/openssl/include \
26+
OPENSSL_LIB_DIR=/openssl/lib

‎src/main.rs

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -98,6 +98,7 @@ pub enum Target {
9898
ArmUnknownLinuxMusleabi,
9999
Armv7UnknownLinuxGnueabihf,
100100
Armv7UnknownLinuxMusleabihf,
101+
I586UnknownLinuxGnu,
101102
I686UnknownLinuxGnu,
102103
I686UnknownLinuxMusl,
103104
Mips64UnknownLinuxGnuabi64,
@@ -199,6 +200,7 @@ impl Target {
199200
Target::ArmUnknownLinuxMusleabi |
200201
Target::Armv7UnknownLinuxGnueabihf |
201202
Target::Armv7UnknownLinuxMusleabihf |
203+
Target::I586UnknownLinuxGnu |
202204
Target::I686UnknownLinuxGnu |
203205
Target::I686UnknownLinuxMusl |
204206
Target::Mips64UnknownLinuxGnuabi64 |
@@ -236,6 +238,7 @@ impl Target {
236238
!triple.starts_with("i586") &&
237239
!triple.starts_with("i686")
238240
}
241+
Target::I586UnknownLinuxGnu |
239242
Target::I686UnknownLinuxGnu |
240243
Target::I686UnknownLinuxMusl |
241244
Target::X86_64UnknownLinuxGnu |
@@ -262,6 +265,7 @@ impl Target {
262265
Armv7UnknownLinuxGnueabihf => "armv7-unknown-linux-gnueabihf",
263266
Armv7UnknownLinuxMusleabihf => "armv7-unknown-linux-musleabihf",
264267
AsmjsUnknownEmscripten => "asmjs-unknown-emscripten",
268+
I586UnknownLinuxGnu => "i586-unknown-linux-gnu",
265269
I686AppleDarwin => "i686-apple-darwin",
266270
I686LinuxAndroid => "i686-linux-android",
267271
I686PcWindowsGnu => "i686-pc-windows-gnu",
@@ -314,6 +318,7 @@ impl Target {
314318
"armv7-unknown-linux-gnueabihf" => Armv7UnknownLinuxGnueabihf,
315319
"armv7-unknown-linux-musleabihf" => Armv7UnknownLinuxMusleabihf,
316320
"asmjs-unknown-emscripten" => AsmjsUnknownEmscripten,
321+
"i586-unknown-linux-gnu" => I586UnknownLinuxGnu,
317322
"i686-apple-darwin" => I686AppleDarwin,
318323
"i686-linux-android" => I686LinuxAndroid,
319324
"i686-pc-windows-gnu" => I686PcWindowsGnu,

0 commit comments

Comments
 (0)