From 8101ca8f2cd310f45cb0639d7c51ec8a66bec413 Mon Sep 17 00:00:00 2001 From: Peter Bigot Date: Mon, 12 Aug 2019 16:51:31 -0500 Subject: [PATCH] soc/arm/arm: rearrange for standard use of extern "C" Move the tail include file outside the extern "C" block. Background from issue #17997: Declarations that use C linkage should be placed within extern "C" so the language linkage is correct when the header is included by a C++ compiler. Similarly #include directives should be outside the extern "C" to ensure the language-specific default linkage is applied to any declarations provided by the included header. See: https://en.cppreference.com/w/cpp/language/language_linkage Signed-off-by: Peter Bigot --- soc/arm/arm/beetle/CMSDK_BEETLE.h | 4 ++-- soc/arm/arm/musca_a/system_cmsdk_musca.h | 5 ++--- soc/arm/arm/musca_b1/system_cmsdk_musca_b1.h | 5 ++--- 3 files changed, 6 insertions(+), 8 deletions(-) diff --git a/soc/arm/arm/beetle/CMSDK_BEETLE.h b/soc/arm/arm/beetle/CMSDK_BEETLE.h index 043e8ec011a..3a5e8b7f39e 100644 --- a/soc/arm/arm/beetle/CMSDK_BEETLE.h +++ b/soc/arm/arm/beetle/CMSDK_BEETLE.h @@ -92,10 +92,10 @@ typedef enum IRQn #define __NVIC_PRIO_BITS 3 /* Number of Bits used for Priority Levels */ #define __Vendor_SysTickConfig 0 /* Set to 1 if different SysTick Config is used */ -#include /* Processor and core peripherals */ - #ifdef __cplusplus } #endif +#include /* Processor and core peripherals */ + #endif /* CMSDK_BEETLE_H */ diff --git a/soc/arm/arm/musca_a/system_cmsdk_musca.h b/soc/arm/arm/musca_a/system_cmsdk_musca.h index d9d5ac77c28..ceb07e0ecf8 100644 --- a/soc/arm/arm/musca_a/system_cmsdk_musca.h +++ b/soc/arm/arm/musca_a/system_cmsdk_musca.h @@ -131,11 +131,10 @@ typedef enum IRQn { #define __FPU_PRESENT 0U /* no FPU present */ #define __DSP_PRESENT 0U /* no DSP extension present */ - -#include /*!< ARM Cortex-M33 processor and core peripherals */ - #ifdef __cplusplus } #endif +#include /*!< ARM Cortex-M33 processor and core peripherals */ + #endif /* SYSTEM_CMSDK_MUSCA_H */ diff --git a/soc/arm/arm/musca_b1/system_cmsdk_musca_b1.h b/soc/arm/arm/musca_b1/system_cmsdk_musca_b1.h index 91d4a14805a..4a102d713a3 100644 --- a/soc/arm/arm/musca_b1/system_cmsdk_musca_b1.h +++ b/soc/arm/arm/musca_b1/system_cmsdk_musca_b1.h @@ -131,11 +131,10 @@ typedef enum IRQn { #define __FPU_PRESENT 0U /* no FPU present */ #define __DSP_PRESENT 0U /* no DSP extension present */ - -#include /*!< ARM Cortex-M33 processor and core peripherals */ - #ifdef __cplusplus } #endif +#include /*!< ARM Cortex-M33 processor and core peripherals */ + #endif /* SYSTEM_CMSDK_MUSCA_B1_H */