Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

NRF: Migrate ARM Compiler 5 feature re-locate zero initialized variables #13047

Merged
merged 1 commit into from
Jun 5, 2020
Merged

NRF: Migrate ARM Compiler 5 feature re-locate zero initialized variables #13047

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions targets/TARGET_NORDIC/TARGET_NRF5x/TARGET_NRF52/reloc_vector_table.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -47,8 +47,8 @@
#include "nrf_dfu_mbr.h"
#endif

#if defined(__CC_ARM) || (defined(__ARMCC_VERSION) && (__ARMCC_VERSION >= 6010050))
__attribute__ ((section(".bss.nvictable"),zero_init))
#if defined(__ARMCC_VERSION)
__attribute__ ((section(".bss.nvictable")))
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

While here I'd strip the above test down to defined(__ARMCC_VERSION). That sort of stripping has already occurred in the core codebase.

(That form of the test was always weird - it means "ARMC5 or (ARMC and ARMC6)". Trying to construct a complicated test for "any version of ARMC" with a perfectly good test for "any version of ARMC" in the middle of it - __ARMCC_VERSION being defined).

Copy link
Collaborator Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Done.

uint32_t nrf_dispatch_vector[NVIC_NUM_VECTORS];
#elif defined(__GNUC__)
__attribute__ ((section(".nvictable")))
Expand Down