From 9ad9f400e61c8d15fbb0bfbc43ff1d4cff8488d5 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Joakim=20Nohlg=C3=A5rd?= Date: Wed, 1 Jun 2016 16:12:38 +0200 Subject: [PATCH] cpu/cortexm_common: Remove register keyword from variables register is deprecated when building C++11 code and removed in C++17, using it will cause build failures with C++ and -Werror. The register hint keyword is likely ignored in GCC anyway. --- cpu/cortexm_common/include/cmsis_gcc.h | 4 ++-- cpu/cortexm_common/include/cpu.h | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/cpu/cortexm_common/include/cmsis_gcc.h b/cpu/cortexm_common/include/cmsis_gcc.h index fd2f7f4cbd..2c303362a7 100644 --- a/cpu/cortexm_common/include/cmsis_gcc.h +++ b/cpu/cortexm_common/include/cmsis_gcc.h @@ -151,7 +151,7 @@ __attribute__( ( always_inline ) ) __STATIC_INLINE uint32_t __get_xPSR(void) */ __attribute__( ( always_inline ) ) __STATIC_INLINE uint32_t __get_PSP(void) { - register uint32_t result; + uint32_t result; __ASM volatile ("MRS %0, psp\n" : "=r" (result) ); return(result); @@ -176,7 +176,7 @@ __attribute__( ( always_inline ) ) __STATIC_INLINE void __set_PSP(uint32_t topOf */ __attribute__( ( always_inline ) ) __STATIC_INLINE uint32_t __get_MSP(void) { - register uint32_t result; + uint32_t result; __ASM volatile ("MRS %0, msp\n" : "=r" (result) ); return(result); diff --git a/cpu/cortexm_common/include/cpu.h b/cpu/cortexm_common/include/cpu.h index b0628db9e1..0a6f395a1a 100644 --- a/cpu/cortexm_common/include/cpu.h +++ b/cpu/cortexm_common/include/cpu.h @@ -63,7 +63,7 @@ void cortexm_init(void); */ static inline void cpu_print_last_instruction(void) { - register uint32_t *lr_ptr; + uint32_t *lr_ptr; __asm__ __volatile__("mov %0, lr" : "=r"(lr_ptr)); printf("%p\n", (void*) lr_ptr); }