Skip to content

Commit 84785ae

Browse files
committed
Check for __ARMCC_VERSION only
1 parent 988aba4 commit 84785ae

File tree

3 files changed

+6
-6
lines changed

3 files changed

+6
-6
lines changed

targets/TARGET_NORDIC/TARGET_NRF5x/TARGET_SDK_14_2/TARGET_SOFTDEVICE_COMMON/softdevice/common/nrf_sdh_ble.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -65,7 +65,7 @@ NRF_SECTION_SET_DEF(sdh_ble_observers, nrf_sdh_ble_evt_observer_t, NRF_SDH_BLE_O
6565

6666

6767
//lint -save -e10 -e19 -e40 -e27 Illegal character (0x24)
68-
#if defined(__CC_ARM) || defined(__ARMCC_VERSION)
68+
#if defined(__ARMCC_VERSION)
6969
extern uint32_t Image$$RW_IRAM1$$Base;
7070
uint32_t const * const m_ram_start = &Image$$RW_IRAM1$$Base;
7171
#elif defined(__ICCARM__)

targets/TARGET_NORDIC/TARGET_NRF5x/TARGET_SDK_14_2/libraries/experimental_section_vars/nrf_section.h

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -66,7 +66,7 @@ extern "C" {
6666
* param[in] section_name Name of the section.
6767
* @hideinitializer
6868
*/
69-
#if defined(__CC_ARM) || defined(__ARMCC_VERSION)
69+
#if defined(__ARMCC_VERSION)
7070
#define NRF_SECTION_START_ADDR(section_name) &CONCAT_2(section_name, $$Base)
7171

7272
#elif defined(__GNUC__)
@@ -82,7 +82,7 @@ extern "C" {
8282
* @param[in] section_name Name of the section.
8383
* @hideinitializer
8484
*/
85-
#if defined(__CC_ARM) || defined(__ARMCC_VERSION)
85+
#if defined(__ARMCC_VERSION)
8686
#define NRF_SECTION_END_ADDR(section_name) &CONCAT_2(section_name, $$Limit)
8787

8888
#elif defined(__GNUC__)
@@ -111,7 +111,7 @@ extern "C" {
111111
* @warning Data type must be word aligned to prevent padding.
112112
* @hideinitializer
113113
*/
114-
#if defined(__CC_ARM) || defined(__ARMCC_VERSION)
114+
#if defined(__ARMCC_VERSION)
115115
#define NRF_SECTION_DEF(section_name, data_type) \
116116
extern data_type * CONCAT_2(section_name, $$Base); \
117117
extern void * CONCAT_2(section_name, $$Limit)
@@ -140,7 +140,7 @@ extern "C" {
140140
* @param[in] section_var Variable to register in the given section.
141141
* @hideinitializer
142142
*/
143-
#if defined(__CC_ARM) || defined(__ARMCC_VERSION)
143+
#if defined(__ARMCC_VERSION)
144144
#define NRF_SECTION_ITEM_REGISTER(section_name, section_var) \
145145
section_var __attribute__ ((section(STRINGIFY(section_name)))) __attribute__((used))
146146

targets/TARGET_NORDIC/TARGET_NRF5x/TARGET_SDK_14_2/libraries/experimental_section_vars/nrf_section_iter.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -87,7 +87,7 @@ typedef struct
8787
typedef struct
8888
{
8989
nrf_section_set_t const * p_set; //!< Pointer to the appropriate section set.
90-
#if !defined(__GNUC__) || (defined(__CC_ARM) || defined(__ARMCC_VERSION))
90+
#if !defined(__GNUC__) || defined(__ARMCC_VERSION)
9191
nrf_section_t const * p_section; //!< Pointer to the selected section.
9292
/**<
9393
* In case of GCC all sections in the set are sorted and

0 commit comments

Comments
 (0)