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

Support for ARMCC6 #1

Draft
wants to merge 3 commits into
base: master
Choose a base branch
from
Draft

Support for ARMCC6 #1

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
d38b7e1
Check for ( __CC_ARM ) || (__ARMCC_VERSION)
microbit-sam Jul 3, 2019
ff46586
Fix missing underscore. Move define to correct place
microbit-sam Jul 3, 2019
d1191da
Fix defines, check ARMCC Version
microbit-sam Jul 3, 2019
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
2 changes: 1 addition & 1 deletion source/nordic_sdk/components/drivers_nrf/delay/nrf_delay.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -111,7 +111,7 @@ loop
BX LR
}

#elif defined ( __ICCARM__ )
#elif defined ( __ICCARM__ ) || (__ARMCC_VERSION >= 6000000)

static void __INLINE nrf_delay_us(uint32_t volatile number_of_us)
{
Expand Down
20 changes: 10 additions & 10 deletions source/nordic_sdk/components/libraries/experimental_section_vars/section_vars.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,7 @@

#include "app_util.h"

#if defined __ICC_ARM__
#if defined (__ICC_ARM__) || (__ARMCC_VERSION >= 6000000)

// turn on language extensions for iar
#pragma language=extended
Expand Down Expand Up @@ -69,7 +69,7 @@
// Not required by this compiler
#define NRF_SECTION_VARS_REGISTER_SECTION(section_name)

#elif defined __ICCARM__
#elif defined (__ICCARM__) || (__ARMCC_VERSION >= 6000000)

#define NRF_SECTION_VARS_REGISTER_SECTION(section_name) NRF_PRAGMA(section = ## #section_name )

Expand All @@ -96,7 +96,7 @@

#define NRF_SECTION_VARS_START_SYMBOL(section_name) __start_ ## section_name

#elif defined __ICCARM__
#elif defined (__ICCARM__) || (__ARMCC_VERSION >= 6000000)

#define NRF_SECTION_VARS_START_SYMBOL(section_name) __section_begin(#section_name)

Expand All @@ -122,7 +122,7 @@

#define NRF_SECTION_VARS_END_SYMBOL(section_name) __stop_ ## section_name

#elif defined __ICCARM__
#elif defined (__ICCARM__) || (__ARMCC_VERSION >= 6000000)

#define NRF_SECTION_VARS_END_SYMBOL(section_name) __section_end(#section_name)

Expand All @@ -148,7 +148,7 @@
#define NRF_SECTION_VARS_LENGTH(section_name) \
((uint32_t)&NRF_SECTION_VARS_END_SYMBOL(section_name) - (uint32_t)&NRF_SECTION_VARS_START_SYMBOL(section_name))

#elif defined __ICCARM__
#elif defined (__ICCARM__) || (__ARMCC_VERSION >= 6000000)

#define NRF_SECTION_VARS_LENGTH(section_name) \
((uint32_t)NRF_SECTION_VARS_END_SYMBOL(section_name) - (uint32_t)NRF_SECTION_VARS_START_SYMBOL(section_name))
Expand All @@ -172,7 +172,7 @@

#define NRF_SECTION_VARS_START_ADDR(section_name) (uint32_t)&NRF_SECTION_VARS_START_SYMBOL(section_name)

#elif defined __ICCARM__
#elif defined (__ICCARM__) || (__ARMCC_VERSION >= 6000000)

#define NRF_SECTION_VARS_START_ADDR(section_name) (uint32_t)iar_ ## section_name ## _start

Expand All @@ -195,7 +195,7 @@

#define NRF_SECTION_VARS_END_ADDR(section_name) (uint32_t)&NRF_SECTION_VARS_END_SYMBOL(section_name)

#elif defined __ICCARM__
#elif defined (__ICCARM__) || (__ARMCC_VERSION >= 6000000)

#define NRF_SECTION_VARS_END_ADDR(section_name) (uint32_t)iar_ ## section_name ## _end

Expand Down Expand Up @@ -225,7 +225,7 @@
extern type_name* NRF_SECTION_VARS_START_SYMBOL(section_name); \
extern void* NRF_SECTION_VARS_END_SYMBOL(section_name)

#elif defined __ICCARM__
#elif defined (__ICCARM__) || (__ARMCC_VERSION >= 6000000)

// No symbol registration required for IAR
#define NRF_SECTION_VARS_REGISTER_SYMBOLS(type_name, section_name) \
Expand Down Expand Up @@ -263,7 +263,7 @@
#define NRF_SECTION_VARS_ADD(section_name, type_def) \
static type_def __attribute__ ((section( #section_name ))) __attribute__ ((used))

#elif defined __ICCARM__
#elif defined (__ICCARM__) || (__ARMCC_VERSION >= 6000000)

#define NRF_SECTION_VARS_ADD(section_name, type_def) \
__root type_def @ #section_name
Expand Down Expand Up @@ -298,7 +298,7 @@
#define NRF_SECTION_VARS_GET(i, type_name, section_name) \
(type_name*)(NRF_SECTION_VARS_START_ADDR(section_name) + i * sizeof(type_name))

#elif defined __ICCARM__
#elif defined (__ICCARM__) || (__ARMCC_VERSION >= 6000000)

#define NRF_SECTION_VARS_GET(i, type_name, section_name) \
(type_name*)iar_ ## section_name ## _start + (i * sizeof(type_name))
Expand Down