Check for __ARMCC_VERSION only

pull/9888/head
Senthil Ramakrishnan 2019-02-06 13:12:51 -06:00 committed by Senthil Ramakrishnan
parent 988aba4fc4
commit 84785ae086
3 changed files with 6 additions and 6 deletions

View File

@ -65,7 +65,7 @@ NRF_SECTION_SET_DEF(sdh_ble_observers, nrf_sdh_ble_evt_observer_t, NRF_SDH_BLE_O
//lint -save -e10 -e19 -e40 -e27 Illegal character (0x24) //lint -save -e10 -e19 -e40 -e27 Illegal character (0x24)
#if defined(__CC_ARM) || defined(__ARMCC_VERSION) #if defined(__ARMCC_VERSION)
extern uint32_t Image$$RW_IRAM1$$Base; extern uint32_t Image$$RW_IRAM1$$Base;
uint32_t const * const m_ram_start = &Image$$RW_IRAM1$$Base; uint32_t const * const m_ram_start = &Image$$RW_IRAM1$$Base;
#elif defined(__ICCARM__) #elif defined(__ICCARM__)

View File

@ -66,7 +66,7 @@ extern "C" {
* param[in] section_name Name of the section. * param[in] section_name Name of the section.
* @hideinitializer * @hideinitializer
*/ */
#if defined(__CC_ARM) || defined(__ARMCC_VERSION) #if defined(__ARMCC_VERSION)
#define NRF_SECTION_START_ADDR(section_name) &CONCAT_2(section_name, $$Base) #define NRF_SECTION_START_ADDR(section_name) &CONCAT_2(section_name, $$Base)
#elif defined(__GNUC__) #elif defined(__GNUC__)
@ -82,7 +82,7 @@ extern "C" {
* @param[in] section_name Name of the section. * @param[in] section_name Name of the section.
* @hideinitializer * @hideinitializer
*/ */
#if defined(__CC_ARM) || defined(__ARMCC_VERSION) #if defined(__ARMCC_VERSION)
#define NRF_SECTION_END_ADDR(section_name) &CONCAT_2(section_name, $$Limit) #define NRF_SECTION_END_ADDR(section_name) &CONCAT_2(section_name, $$Limit)
#elif defined(__GNUC__) #elif defined(__GNUC__)
@ -111,7 +111,7 @@ extern "C" {
* @warning Data type must be word aligned to prevent padding. * @warning Data type must be word aligned to prevent padding.
* @hideinitializer * @hideinitializer
*/ */
#if defined(__CC_ARM) || defined(__ARMCC_VERSION) #if defined(__ARMCC_VERSION)
#define NRF_SECTION_DEF(section_name, data_type) \ #define NRF_SECTION_DEF(section_name, data_type) \
extern data_type * CONCAT_2(section_name, $$Base); \ extern data_type * CONCAT_2(section_name, $$Base); \
extern void * CONCAT_2(section_name, $$Limit) extern void * CONCAT_2(section_name, $$Limit)
@ -140,7 +140,7 @@ extern "C" {
* @param[in] section_var Variable to register in the given section. * @param[in] section_var Variable to register in the given section.
* @hideinitializer * @hideinitializer
*/ */
#if defined(__CC_ARM) || defined(__ARMCC_VERSION) #if defined(__ARMCC_VERSION)
#define NRF_SECTION_ITEM_REGISTER(section_name, section_var) \ #define NRF_SECTION_ITEM_REGISTER(section_name, section_var) \
section_var __attribute__ ((section(STRINGIFY(section_name)))) __attribute__((used)) section_var __attribute__ ((section(STRINGIFY(section_name)))) __attribute__((used))

View File

@ -87,7 +87,7 @@ typedef struct
typedef struct typedef struct
{ {
nrf_section_set_t const * p_set; //!< Pointer to the appropriate section set. nrf_section_set_t const * p_set; //!< Pointer to the appropriate section set.
#if !defined(__GNUC__) || (defined(__CC_ARM) || defined(__ARMCC_VERSION)) #if !defined(__GNUC__) || defined(__ARMCC_VERSION)
nrf_section_t const * p_section; //!< Pointer to the selected section. nrf_section_t const * p_section; //!< Pointer to the selected section.
/**< /**<
* In case of GCC all sections in the set are sorted and * In case of GCC all sections in the set are sorted and