Skip to content

Commit ed6be2f

Browse files
committed
add support for arm-unknown-linux-gnueabihf
Closes #155 .
1 parent c32c3a6 commit ed6be2f

File tree

5 files changed

+38
-0
lines changed

5 files changed

+38
-0
lines changed

.travis.yml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,7 @@ matrix:
99
# Linux
1010
- env: TARGET=aarch64-unknown-linux-gnu CPP=1 DYLIB=1 STD=1 OPENSSL=0.5.5 RUN=1
1111
- env: TARGET=arm-unknown-linux-gnueabi CPP=1 DYLIB=1 STD=1 OPENSSL=0.5.5 RUN=1
12+
- env: TARGET=arm-unknown-linux-gnueabihf CPP=1 DYLIB=1 STD=1 OPENSSL=0.5.5 RUN=1
1213
- env: TARGET=arm-unknown-linux-musleabi STD=1 RUN=1
1314
- env: TARGET=armv7-unknown-linux-gnueabihf CPP=1 DYLIB=1 STD=1 OPENSSL=0.5.5 RUN=1
1415
- env: TARGET=armv7-unknown-linux-musleabihf STD=1 RUN=1

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 arm-unknown-linux-gnueabihf
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
@@ -193,6 +193,7 @@ worst, "hang" (never terminate).
193193
| `aarch64-unknown-linux-gnu` | 2.19 | 4.8.2 | 1.0.2m || 2.8.0 ||
194194
| `arm-linux-androideabi` [5] | N/A | 4.9 | 1.0.2m || N/A ||
195195
| `arm-unknown-linux-gnueabi` | 2.19 | 4.8.2 | 1.0.2m || 2.8.0 ||
196+
| `arm-unknown-linux-gnueabihf` | 2.19 | 4.8.2 | 1.0.2m || 2.8.0 ||
196197
| `arm-unknown-linux-musleabi` | 1.1.15 | 5.3.1 | N/A | | 2.8.0 ||
197198
| `armv7-linux-androideabi` [5] | N/A | 4.9 | 1.0.2m || N/A ||
198199
| `armv7-unknown-linux-gnueabihf` | 2.15 | 4.6.2 | 1.0.2m || 2.8.0 ||
Lines changed: 30 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,30 @@
1+
FROM ubuntu:14.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 openssl.sh qemu.sh /
16+
RUN apt-get install -y --no-install-recommends \
17+
g++-arm-linux-gnueabihf \
18+
libc6-dev-armhf-cross && \
19+
bash /openssl.sh linux-armv4 arm-linux-gnueabihf- && \
20+
bash /qemu.sh arm
21+
22+
ENV CARGO_TARGET_ARM_UNKNOWN_LINUX_GNUEABI_LINKER=arm-linux-gnueabihf-gcc \
23+
CARGO_TARGET_ARM_UNKNOWN_LINUX_GNUEABI_RUNNER=qemu-arm \
24+
CC_arm_unknown_linux_gnueabi=arm-linux-gnueabihf-gcc \
25+
CXX_arm_unknown_linux_gnueabi=arm-linux-gnueabihf-g++ \
26+
OPENSSL_DIR=/openssl \
27+
OPENSSL_INCLUDE_DIR=/openssl/include \
28+
OPENSSL_LIB_DIR=/openssl/lib \
29+
QEMU_LD_PREFIX=/usr/arm-linux-gnueabihf \
30+
RUST_TEST_THREADS=1

src/main.rs

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -95,6 +95,7 @@ pub enum Target {
9595
// Linux
9696
Aarch64UnknownLinuxGnu,
9797
ArmUnknownLinuxGnueabi,
98+
ArmUnknownLinuxGnueabihf,
9899
ArmUnknownLinuxMusleabi,
99100
Armv7UnknownLinuxGnueabihf,
100101
Armv7UnknownLinuxMusleabihf,
@@ -196,6 +197,7 @@ impl Target {
196197
match *self {
197198
Target::Aarch64UnknownLinuxGnu |
198199
Target::ArmUnknownLinuxGnueabi |
200+
Target::ArmUnknownLinuxGnueabihf |
199201
Target::ArmUnknownLinuxMusleabi |
200202
Target::Armv7UnknownLinuxGnueabihf |
201203
Target::Armv7UnknownLinuxMusleabihf |
@@ -257,6 +259,7 @@ impl Target {
257259
Aarch64UnknownLinuxGnu => "aarch64-unknown-linux-gnu",
258260
ArmLinuxAndroideabi => "arm-linux-androideabi",
259261
ArmUnknownLinuxGnueabi => "arm-unknown-linux-gnueabi",
262+
ArmUnknownLinuxGnueabihf => "arm-unknown-linux-gnueabihf",
260263
ArmUnknownLinuxMusleabi => "arm-unknown-linux-musleabi",
261264
Armv7LinuxAndroideabi => "armv7-linux-androideabi",
262265
Armv7UnknownLinuxGnueabihf => "armv7-unknown-linux-gnueabihf",
@@ -309,6 +312,7 @@ impl Target {
309312
"aarch64-unknown-linux-gnu" => Aarch64UnknownLinuxGnu,
310313
"arm-linux-androideabi" => ArmLinuxAndroideabi,
311314
"arm-unknown-linux-gnueabi" => ArmUnknownLinuxGnueabi,
315+
"arm-unknown-linux-gnueabihf" => ArmUnknownLinuxGnueabihf,
312316
"arm-unknown-linux-musleabi" => ArmUnknownLinuxMusleabi,
313317
"armv7-linux-androideabi" => Armv7LinuxAndroideabi,
314318
"armv7-unknown-linux-gnueabihf" => Armv7UnknownLinuxGnueabihf,

0 commit comments

Comments
 (0)