Skip to content

Commit 6e9f601

Browse files
committed
Merge pull request #1452 from pguyot/w1/fix-compatibility-with-gcc-arm-none-eabi
Add workaround for latest debian gcc-arm-none-eabi Fixes #1445 These changes are made under both the "Apache 2.0" and the "GNU Lesser General Public License 2.1 or later" license terms (dual license). SPDX-License-Identifier: Apache-2.0 OR LGPL-2.1-or-later
2 parents 1b37e70 + f7592e2 commit 6e9f601

File tree

4 files changed

+6
-13
lines changed

4 files changed

+6
-13
lines changed

.github/workflows/pico-build.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@ concurrency:
3333

3434
jobs:
3535
pico:
36-
runs-on: ubuntu-22.04
36+
runs-on: ubuntu-24.04
3737
strategy:
3838
matrix:
3939
board: ["pico", "pico_w"]

.github/workflows/stm32-build.yaml

Lines changed: 1 addition & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -44,17 +44,6 @@ jobs:
4444
https://repo.hex.pm
4545
https://cdn.jsdelivr.net/hex
4646
47-
- name: Install arm-embedded toolchain
48-
if: ${{ steps.builddeps-cache.outputs.cache-hit != 'true' }}
49-
working-directory: /home/runner
50-
run: |
51-
set -euo pipefail
52-
cd /home/runner
53-
wget https://developer.arm.com/-/media/Files/downloads/gnu/11.3.rel1/binrel/arm-gnu-toolchain-11.3.rel1-x86_64-arm-none-eabi.tar.xz \
54-
--output-document=$RUNNER_TEMP/arm-gnu-toolchain-11.3.rel1-x86_64-arm-none-eabi.tar.xz
55-
tar xJf $RUNNER_TEMP/arm-gnu-toolchain-11.3.rel1-x86_64-arm-none-eabi.tar.xz
56-
pwd && ls
57-
5847
- name: Checkout and build libopencm3
5948
if: ${{ steps.builddeps-cache.outputs.cache-hit != 'true' }}
6049
working-directory: /home/runner
@@ -71,7 +60,7 @@ jobs:
7160
run: sudo apt update
7261

7362
- name: "Install deps"
74-
run: sudo apt install -y cmake gperf
63+
run: sudo apt install -y cmake gperf gcc-arm-none-eabi
7564

7665
- name: Checkout repo
7766
uses: actions/checkout@v4

CHANGELOG.md

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -29,6 +29,7 @@ certain VM instructions are used.
2929
- Added missing lock on socket structure
3030
- Fixed a race condition affecting multi-core MCUs where a timeout would not be properly cleared
3131
- Fixed a double free when esp32 uart driver was closed, yielding an assert abort
32+
- Fixed compilation with latest debian gcc-arm-none-eabi
3233

3334
## [0.6.5] - 2024-10-15
3435

src/libAtomVM/term.h

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -28,6 +28,9 @@
2828
#ifndef _TERM_H_
2929
#define _TERM_H_
3030

31+
// gcc-arm-none-eabi 13.2.1 with newlib requires this first
32+
#include <sys/types.h>
33+
3134
#include <stdbool.h>
3235
#include <stdint.h>
3336
#include <stdio.h>

0 commit comments

Comments
 (0)