Skip to content

Commit c090191

Browse files
committed
CI: Debug arm-none-eabi-gcc
1 parent 2e887bc commit c090191

File tree

2 files changed

+9
-9
lines changed

2 files changed

+9
-9
lines changed

.github/workflows/ci.yaml

+4-4
Original file line numberDiff line numberDiff line change
@@ -62,10 +62,9 @@ jobs:
6262
- name: Install arm-none-eabi-gcc and qemu
6363
if: steps.cache-bin.outputs.cache-hit != 'true'
6464
run: |
65-
mkdir -p gcc ~/cache-bin
66-
curl -L https://developer.arm.com/-/media/Files/downloads/gnu-rm/7-2018q2/gcc-arm-none-eabi-7-2018-q2-update-linux.tar.bz2?revision=bc2c96c0-14b5-4bb4-9f18-bceb4050fee7?product=GNU%20Arm%20Embedded%20Toolchain,64-bit,,Linux,7-2018-q2-update \
67-
| tar --strip-components=1 -C gcc -xj
68-
cp gcc/bin/* ~/cache-bin
65+
mkdir -p ~/cache-bin/gcc
66+
curl -L https://developer.arm.com/-/media/Files/downloads/gnu-rm/10.3-2021.07/gcc-arm-none-eabi-10.3-2021.07-x86_64-linux.tar.bz2 \
67+
| tar --strip-components=1 -C ~/cache-bin/gcc -xj
6968
7069
curl -L https://github.com/japaric/qemu-bin/raw/master/14.04/qemu-system-arm-2.12.0 \
7170
> ~/cache-bin/qemu-system-arm
@@ -79,6 +78,7 @@ jobs:
7978
- name: Put new bin directory into path
8079
run: |
8180
echo "~/cache-bin" >> $GITHUB_PATH
81+
echo "~/cache-bin/gcc/bin" >> $GITHUB_PATH
8282
8383
- name: Test arm-none-eabi-gcc
8484
run: |

ci/script.sh

+5-5
Original file line numberDiff line numberDiff line change
@@ -124,12 +124,12 @@ main() {
124124

125125
# check that the disassembly matches
126126
pushd app
127-
export CC_thumbv7m_none_eabi=$HOME/cache-bin/arm-none-eabi-gcc
128-
export CC=$HOME/cache-bin/arm-none-eabi-gcc
129-
echo $CC_thumbv7m_none_eabi
130-
echo $CC
127+
env
128+
which arm-none-eabi-gcc
129+
which arm-none-eabi-as
130+
which as
131131
arm-none-eabi-gcc --version
132-
arm-none-eabi-gcc -O3 -ffunction-sections -fdata-sections -mthumb -march=armv7-m -Wall -Wextra -c ../rt/asm.s
132+
arm-none-eabi-gcc -v -O3 -ffunction-sections -fdata-sections -mthumb -march=armv7-m -Wall -Wextra -c ../rt/asm.s
133133
cargo build --bin app --release
134134
diff -b release.objdump \
135135
<(cargo objdump --bin app --release -- -d --no-show-raw-insn --print-imm-hex --no-leading-addr)

0 commit comments

Comments
 (0)