Skip to content

Commit

Permalink
[nrf fromtree] soc: nrf53: fix building anomaly 168 workaround
Browse files Browse the repository at this point in the history
With GCC 12.3 and binutils 2.40, the build fails with:

<...>/zephyr/arch/arm/core/cortex_m/cpu_idle.S: Assembler messages:
<...>/zephyr/arch/arm/core/cortex_m/cpu_idle.S:51: Error: junk at end of line, first unrecognized character is `n'
<...>/zephyr/arch/arm/core/cortex_m/cpu_idle.S:133:   Info: macro invoked from here

Because the SOC_ON_EXIT_CPU_IDLE macro puts all the statements on a
single line, there must be a semicolon after .rept

Signed-off-by: Ben Wolsieffer <benwolsieffer@gmail.com>
(cherry picked from commit 37352d3)
  • Loading branch information
lopsided98 authored and gmarull committed Aug 20, 2024
1 parent 7967848 commit c0aa4d2
Showing 1 changed file with 2 additions and 2 deletions.
4 changes: 2 additions & 2 deletions soc/arm/nordic_nrf/nrf53/soc_cpu_idle.h
Original file line number Diff line number Diff line change
Expand Up @@ -13,12 +13,12 @@

#if defined(CONFIG_SOC_NRF53_ANOMALY_168_WORKAROUND_FOR_EXECUTION_FROM_RAM)
#define SOC_ON_EXIT_CPU_IDLE \
.rept 26 \
.rept 26; \
nop; \
.endr
#elif defined(CONFIG_SOC_NRF53_ANOMALY_168_WORKAROUND)
#define SOC_ON_EXIT_CPU_IDLE \
.rept 8 \
.rept 8; \
nop; \
.endr
#endif
Expand Down

0 comments on commit c0aa4d2

Please sign in to comment.