Skip to content

Commit 342841a

Browse files
committed
[CMSIS_5]: Updated to 0b521765
1 parent a62b312 commit 342841a

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

56 files changed

+2722
-8868
lines changed

cmsis/TARGET_CORTEX_A/cmsis_gcc.h

Lines changed: 9 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,11 @@
11
/**************************************************************************//**
22
* @file cmsis_gcc.h
33
* @brief CMSIS compiler specific macros, functions, instructions
4-
* @version V1.0.1
5-
* @date 07. Sep 2017
4+
* @version V1.0.2
5+
* @date 09. April 2018
66
******************************************************************************/
77
/*
8-
* Copyright (c) 2009-2017 ARM Limited. All rights reserved.
8+
* Copyright (c) 2009-2018 Arm Limited. All rights reserved.
99
*
1010
* SPDX-License-Identifier: Apache-2.0
1111
*
@@ -450,7 +450,9 @@ __STATIC_FORCEINLINE uint32_t __get_FPSCR(void)
450450
{
451451
#if ((defined (__FPU_PRESENT) && (__FPU_PRESENT == 1U)) && \
452452
(defined (__FPU_USED ) && (__FPU_USED == 1U)) )
453-
#if __has_builtin(__builtin_arm_get_fpscr) || (__GNUC__ > 7) || (__GNUC__ == 7 && __GNUC_MINOR__ >= 2)
453+
#if __has_builtin(__builtin_arm_get_fpscr)
454+
// Re-enable using built-in when GCC has been fixed
455+
// || (__GNUC__ > 7) || (__GNUC__ == 7 && __GNUC_MINOR__ >= 2)
454456
/* see https://gcc.gnu.org/ml/gcc-patches/2017-04/msg00443.html */
455457
return __builtin_arm_get_fpscr();
456458
#else
@@ -473,7 +475,9 @@ __STATIC_FORCEINLINE void __set_FPSCR(uint32_t fpscr)
473475
{
474476
#if ((defined (__FPU_PRESENT) && (__FPU_PRESENT == 1U)) && \
475477
(defined (__FPU_USED ) && (__FPU_USED == 1U)) )
476-
#if __has_builtin(__builtin_arm_set_fpscr) || (__GNUC__ > 7) || (__GNUC__ == 7 && __GNUC_MINOR__ >= 2)
478+
#if __has_builtin(__builtin_arm_set_fpscr)
479+
// Re-enable using built-in when GCC has been fixed
480+
// || (__GNUC__ > 7) || (__GNUC__ == 7 && __GNUC_MINOR__ >= 2)
477481
/* see https://gcc.gnu.org/ml/gcc-patches/2017-04/msg00443.html */
478482
__builtin_arm_set_fpscr(fpscr);
479483
#else

cmsis/TARGET_CORTEX_A/cmsis_iccarm.h

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
/**************************************************************************//**
22
* @file cmsis_iccarm.h
33
* @brief CMSIS compiler ICCARM (IAR Compiler for Arm) header file
4-
* @version V5.0.5
5-
* @date 10. January 2018
4+
* @version V5.0.6
5+
* @date 02. March 2018
66
******************************************************************************/
77

88
//------------------------------------------------------------------------------
@@ -109,7 +109,7 @@
109109
#endif
110110

111111
#ifndef __RESTRICT
112-
#define __RESTRICT restrict
112+
#define __RESTRICT __restrict
113113
#endif
114114

115115
#ifndef __STATIC_INLINE

cmsis/TARGET_CORTEX_A/core_ca.h

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
/**************************************************************************//**
22
* @file core_ca.h
33
* @brief CMSIS Cortex-A Core Peripheral Access Layer Header File
4-
* @version V1.00
5-
* @date 22. Feb 2017
4+
* @version V1.0.1
5+
* @date 07. May 2018
66
******************************************************************************/
77
/*
88
* Copyright (c) 2009-2017 ARM Limited. All rights reserved.
@@ -1284,8 +1284,6 @@ __STATIC_INLINE void GIC_SetPendingIRQ(IRQn_Type IRQn)
12841284
} else {
12851285
// INTID 0-15 Software Generated Interrupt
12861286
GICDistributor->SPENDSGIR[IRQn / 4U] = 1U << ((IRQn % 4U) * 8U);
1287-
// Forward the interrupt to the CPU interface that requested it
1288-
GICDistributor->SGIR = (IRQn | 0x02000000U);
12891287
}
12901288
}
12911289

0 commit comments

Comments
 (0)