From 84785ae086b798e54552e154bb99212c4fc59142 Mon Sep 17 00:00:00 2001 From: Senthil Ramakrishnan Date: Wed, 6 Feb 2019 13:12:51 -0600 Subject: [PATCH] Check for __ARMCC_VERSION only --- .../softdevice/common/nrf_sdh_ble.c | 2 +- .../libraries/experimental_section_vars/nrf_section.h | 8 ++++---- .../experimental_section_vars/nrf_section_iter.h | 2 +- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/targets/TARGET_NORDIC/TARGET_NRF5x/TARGET_SDK_14_2/TARGET_SOFTDEVICE_COMMON/softdevice/common/nrf_sdh_ble.c b/targets/TARGET_NORDIC/TARGET_NRF5x/TARGET_SDK_14_2/TARGET_SOFTDEVICE_COMMON/softdevice/common/nrf_sdh_ble.c index a064a48956..4ebf46e551 100644 --- a/targets/TARGET_NORDIC/TARGET_NRF5x/TARGET_SDK_14_2/TARGET_SOFTDEVICE_COMMON/softdevice/common/nrf_sdh_ble.c +++ b/targets/TARGET_NORDIC/TARGET_NRF5x/TARGET_SDK_14_2/TARGET_SOFTDEVICE_COMMON/softdevice/common/nrf_sdh_ble.c @@ -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) -#if defined(__CC_ARM) || defined(__ARMCC_VERSION) +#if defined(__ARMCC_VERSION) extern uint32_t Image$$RW_IRAM1$$Base; uint32_t const * const m_ram_start = &Image$$RW_IRAM1$$Base; #elif defined(__ICCARM__) diff --git a/targets/TARGET_NORDIC/TARGET_NRF5x/TARGET_SDK_14_2/libraries/experimental_section_vars/nrf_section.h b/targets/TARGET_NORDIC/TARGET_NRF5x/TARGET_SDK_14_2/libraries/experimental_section_vars/nrf_section.h index 86a4f6d150..83753e7ea6 100644 --- a/targets/TARGET_NORDIC/TARGET_NRF5x/TARGET_SDK_14_2/libraries/experimental_section_vars/nrf_section.h +++ b/targets/TARGET_NORDIC/TARGET_NRF5x/TARGET_SDK_14_2/libraries/experimental_section_vars/nrf_section.h @@ -66,7 +66,7 @@ extern "C" { * param[in] section_name Name of the section. * @hideinitializer */ -#if defined(__CC_ARM) || defined(__ARMCC_VERSION) +#if defined(__ARMCC_VERSION) #define NRF_SECTION_START_ADDR(section_name) &CONCAT_2(section_name, $$Base) #elif defined(__GNUC__) @@ -82,7 +82,7 @@ extern "C" { * @param[in] section_name Name of the section. * @hideinitializer */ -#if defined(__CC_ARM) || defined(__ARMCC_VERSION) +#if defined(__ARMCC_VERSION) #define NRF_SECTION_END_ADDR(section_name) &CONCAT_2(section_name, $$Limit) #elif defined(__GNUC__) @@ -111,7 +111,7 @@ extern "C" { * @warning Data type must be word aligned to prevent padding. * @hideinitializer */ -#if defined(__CC_ARM) || defined(__ARMCC_VERSION) +#if defined(__ARMCC_VERSION) #define NRF_SECTION_DEF(section_name, data_type) \ extern data_type * CONCAT_2(section_name, $$Base); \ extern void * CONCAT_2(section_name, $$Limit) @@ -140,7 +140,7 @@ extern "C" { * @param[in] section_var Variable to register in the given section. * @hideinitializer */ -#if defined(__CC_ARM) || defined(__ARMCC_VERSION) +#if defined(__ARMCC_VERSION) #define NRF_SECTION_ITEM_REGISTER(section_name, section_var) \ section_var __attribute__ ((section(STRINGIFY(section_name)))) __attribute__((used)) diff --git a/targets/TARGET_NORDIC/TARGET_NRF5x/TARGET_SDK_14_2/libraries/experimental_section_vars/nrf_section_iter.h b/targets/TARGET_NORDIC/TARGET_NRF5x/TARGET_SDK_14_2/libraries/experimental_section_vars/nrf_section_iter.h index 3ff7919233..60cf0f6669 100644 --- a/targets/TARGET_NORDIC/TARGET_NRF5x/TARGET_SDK_14_2/libraries/experimental_section_vars/nrf_section_iter.h +++ b/targets/TARGET_NORDIC/TARGET_NRF5x/TARGET_SDK_14_2/libraries/experimental_section_vars/nrf_section_iter.h @@ -87,7 +87,7 @@ typedef struct typedef struct { 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. /**< * In case of GCC all sections in the set are sorted and