Skip to content

Commit c861d19

Browse files
Merge pull request #117 from onsdagens/global_asm_link
Fix oor branch via linking
2 parents 8a54bb1 + fc48c00 commit c861d19

File tree

3 files changed

+2
-7
lines changed

3 files changed

+2
-7
lines changed

riscv-rt/.github/workflows/build.yaml

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -47,4 +47,3 @@ jobs:
4747
if: always()
4848
steps:
4949
- run: jq --exit-status 'all(.result == "success")' <<< '${{ toJson(needs) }}'
50-

riscv-rt/link.x

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -57,7 +57,7 @@ SECTIONS
5757
. = ALIGN(4);
5858
*(.trap);
5959
*(.trap.rust);
60-
60+
*(.text.abort);
6161
*(.text .text.*);
6262
} > REGION_TEXT
6363

riscv-rt/src/asm.rs

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -92,11 +92,7 @@ _abs_start:
9292
"csrr t2, mhartid",
9393
"lui t0, %hi(_max_hart_id)
9494
add t0, t0, %lo(_max_hart_id)
95-
// bgtu t2, t0, abort
96-
bleu t2, t0, not_abort
97-
la t0, abort
98-
jr t0
99-
not_abort:
95+
bgtu t2, t0, abort
10096
10197
// Allocate stacks
10298
la sp, _stack_start

0 commit comments

Comments
 (0)