Skip to content

Commit 0d2b8b5

Browse files
bors[bot]Alexhuszagh
bors[bot]
and
Alexhuszagh
authored
Merge #1118
1118: Added ARMv8-M newlib targets. r=Emilgardis a=Alexhuszagh Closes #1116. Co-authored-by: Alex Huszagh <[email protected]>
2 parents d4b2141 + 2174382 commit 0d2b8b5

7 files changed

+107
-0
lines changed

‎.changes/1118.json

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
{
2+
"type": "added",
3+
"description": "added ARMv8-M newlib targets.",
4+
"issues": [1116]
5+
}

‎README.md

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -369,6 +369,9 @@ terminate.
369369
| `thumbv7m-none-eabi` [4] | 3.3.0 | 9.2.1 | | N/A | |
370370
| `thumbv7neon-linux-androideabi` [1] | 9.0.8 | 9.0.8 | ✓ | 6.1.0 | ✓ |
371371
| `thumbv7neon-unknown-linux-gnueabihf`| 2.31 | 9.4.0 | ✓ | N/A | ✓ |
372+
| `thumbv8m.base-none-eabi` [4] | 3.3.0 | 9.2.1 | | N/A | |
373+
| `thumbv8m.main-none-eabi` [4] | 3.3.0 | 9.2.1 | | N/A | |
374+
| `thumbv8m.main-none-eabihf` [4] | 3.3.0 | 9.2.1 | | N/A | |
372375
| `wasm32-unknown-emscripten` [6] | 3.1.14 | 15.0.0 | ✓ | N/A | ✓ |
373376
| `x86_64-linux-android` [1] | 9.0.8 | 9.0.8 | ✓ | 6.1.0 | ✓ |
374377
| `x86_64-pc-windows-gnu` | N/A | 9.3 | ✓ | N/A | ✓ |

‎docker/Dockerfile.thumbv8m.base-none-eabi

Lines changed: 24 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,24 @@
1+
FROM ubuntu:20.04
2+
ARG DEBIAN_FRONTEND=noninteractive
3+
4+
COPY common.sh lib.sh /
5+
RUN /common.sh
6+
7+
COPY cmake.sh /
8+
RUN /cmake.sh
9+
10+
COPY xargo.sh /
11+
RUN /xargo.sh
12+
13+
COPY qemu.sh /
14+
RUN apt-get update && apt-get install --assume-yes --no-install-recommends \
15+
gcc-arm-none-eabi \
16+
libnewlib-arm-none-eabi && \
17+
/qemu.sh arm
18+
19+
ENV CROSS_TOOLCHAIN_PREFIX=arm-none-eabi-
20+
ENV QEMU_CPU=cortex-m23 \
21+
AR_thumbv8m.base_none_eabi="$CROSS_TOOLCHAIN_PREFIX"ar \
22+
CC_thumbv8m.base_none_eabi="$CROSS_TOOLCHAIN_PREFIX"gcc \
23+
CXX_thumbv8m.base_none_eabi="$CROSS_TOOLCHAIN_PREFIX"g++ \
24+
CARGO_TARGET_THUMBV8M.BASE_NONE_EABI_RUNNER=qemu-arm

‎docker/Dockerfile.thumbv8m.main-none-eabi

Lines changed: 24 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,24 @@
1+
FROM ubuntu:20.04
2+
ARG DEBIAN_FRONTEND=noninteractive
3+
4+
COPY common.sh lib.sh /
5+
RUN /common.sh
6+
7+
COPY cmake.sh /
8+
RUN /cmake.sh
9+
10+
COPY xargo.sh /
11+
RUN /xargo.sh
12+
13+
COPY qemu.sh /
14+
RUN apt-get update && apt-get install --assume-yes --no-install-recommends \
15+
gcc-arm-none-eabi \
16+
libnewlib-arm-none-eabi && \
17+
/qemu.sh arm
18+
19+
ENV CROSS_TOOLCHAIN_PREFIX=arm-none-eabi-
20+
ENV QEMU_CPU=cortex-m33 \
21+
AR_thumbv8m.main_none_eabi="$CROSS_TOOLCHAIN_PREFIX"ar \
22+
CC_thumbv8m.main_none_eabi="$CROSS_TOOLCHAIN_PREFIX"gcc \
23+
CXX_thumbv8m.main_none_eabi="$CROSS_TOOLCHAIN_PREFIX"g++ \
24+
CARGO_TARGET_THUMBV8M.MAIN_NONE_EABI_RUNNER=qemu-arm

‎docker/Dockerfile.thumbv8m.main-none-eabihf

Lines changed: 24 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,24 @@
1+
FROM ubuntu:20.04
2+
ARG DEBIAN_FRONTEND=noninteractive
3+
4+
COPY common.sh lib.sh /
5+
RUN /common.sh
6+
7+
COPY cmake.sh /
8+
RUN /cmake.sh
9+
10+
COPY xargo.sh /
11+
RUN /xargo.sh
12+
13+
COPY qemu.sh /
14+
RUN apt-get update && apt-get install --assume-yes --no-install-recommends \
15+
gcc-arm-none-eabi \
16+
libnewlib-arm-none-eabi && \
17+
/qemu.sh arm
18+
19+
ENV CROSS_TOOLCHAIN_PREFIX=arm-none-eabi-
20+
ENV QEMU_CPU=cortex-m33 \
21+
AR_thumbv8m.main_none_eabihf="$CROSS_TOOLCHAIN_PREFIX"ar \
22+
CC_thumbv8m.main_none_eabihf="$CROSS_TOOLCHAIN_PREFIX"gcc \
23+
CXX_thumbv8m.main_none_eabihf="$CROSS_TOOLCHAIN_PREFIX"g++ \
24+
CARGO_TARGET_THUMBV8M.MAIN_NONE_EABIHF_RUNNER=qemu-arm

‎src/docker/provided_images.rs

Lines changed: 15 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -273,6 +273,21 @@ pub static PROVIDED_IMAGES: &[ProvidedImage] = &[
273273
platforms: &[ImagePlatform::X86_64_UNKNOWN_LINUX_GNU],
274274
sub: None
275275
},
276+
ProvidedImage {
277+
name: "thumbv8m.base-none-eabi",
278+
platforms: &[ImagePlatform::X86_64_UNKNOWN_LINUX_GNU],
279+
sub: None
280+
},
281+
ProvidedImage {
282+
name: "thumbv8m.main-none-eabi",
283+
platforms: &[ImagePlatform::X86_64_UNKNOWN_LINUX_GNU],
284+
sub: None
285+
},
286+
ProvidedImage {
287+
name: "thumbv8m.main-none-eabihf",
288+
platforms: &[ImagePlatform::X86_64_UNKNOWN_LINUX_GNU],
289+
sub: None
290+
},
276291
ProvidedImage {
277292
name: "zig",
278293
platforms: &[ImagePlatform::X86_64_UNKNOWN_LINUX_GNU],

‎targets.toml

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -457,6 +457,18 @@ target = "thumbv7m-none-eabi"
457457
os = "ubuntu-latest"
458458
std = true
459459

460+
[[target]]
461+
target = "thumbv8m.base-none-eabi"
462+
os = "ubuntu-latest"
463+
464+
[[target]]
465+
target = "thumbv8m.main-none-eabi"
466+
os = "ubuntu-latest"
467+
468+
[[target]]
469+
target = "thumbv8m.main-none-eabihf"
470+
os = "ubuntu-latest"
471+
460472
[[target]]
461473
target = "cross"
462474
os = "ubuntu-latest"

0 commit comments

Comments
 (0)