michaelh/zephyr
1
0
Fork 0
Code Releases Activity

arch/nios2: rearrange for standard use of extern "C"

Browse source 
Consistently place C++ use of extern "C" after all include directives,
within the negative branch of _ASMLANGUAGE if used.

Remove extern "C" support from files that don't declare objects or
functions.

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 <peter.bigot@nordicsemi.no>
This commit is contained in:
Peter Bigot 2019-08-12 12:53:19 -05:00 • committed by Ioannis Glaropoulos
commit 20bb672266
3 changed files with 18 additions and 29 deletions
Download patch file Download diff file Expand all files Collapse all files

26
arch/nios2/include/kernel_arch_data.h
View file

@ -21,23 +21,11 @@
#ifndef ZEPHYR_ARCH_NIOS2_INCLUDE_KERNEL_ARCH_DATA_H_ #ifndef ZEPHYR_ARCH_NIOS2_INCLUDE_KERNEL_ARCH_DATA_H_
#define ZEPHYR_ARCH_NIOS2_INCLUDE_KERNEL_ARCH_DATA_H_ #define ZEPHYR_ARCH_NIOS2_INCLUDE_KERNEL_ARCH_DATA_H_
#ifdef __cplusplus
extern "C" {
#endif
#include <toolchain.h> #include <toolchain.h>
#include <linker/sections.h> #include <linker/sections.h>
#include <arch/cpu.h> #include <arch/cpu.h>
#include <kernel_arch_thread.h> #include <kernel_arch_thread.h>
#ifndef _ASMLANGUAGE
#include <kernel.h>
#include <kernel_internal.h>
#include <zephyr/types.h>
#include <sys/util.h>
#include <sys/dlist.h>
#endif
/* stacks */ /* stacks */
#define STACK_ALIGN_SIZE 4 #define STACK_ALIGN_SIZE 4
@ -47,12 +35,22 @@ extern "C" {
#ifndef _ASMLANGUAGE #ifndef _ASMLANGUAGE
extern K_THREAD_STACK_DEFINE(_interrupt_stack, CONFIG_ISR_STACK_SIZE); #include <kernel.h>
#include <kernel_internal.h>
#include <zephyr/types.h>
#include <sys/util.h>
#include <sys/dlist.h>
#endif /* _ASMLANGUAGE */ #ifdef __cplusplus
extern "C" {
#endif
extern K_THREAD_STACK_DEFINE(_interrupt_stack, CONFIG_ISR_STACK_SIZE);
#ifdef __cplusplus #ifdef __cplusplus
} }
#endif #endif
#endif /* _ASMLANGUAGE */
#endif /* ZEPHYR_ARCH_NIOS2_INCLUDE_KERNEL_ARCH_DATA_H_ */ #endif /* ZEPHYR_ARCH_NIOS2_INCLUDE_KERNEL_ARCH_DATA_H_ */

13
include/arch/nios2/arch.h
View file

@ -22,10 +22,6 @@
#include <arch/common/sys_io.h> #include <arch/common/sys_io.h>
#include <arch/common/ffs.h> #include <arch/common/ffs.h>
#ifdef __cplusplus
extern "C" {
#endif
#define STACK_ALIGN 4 #define STACK_ALIGN 4
#ifndef _ASMLANGUAGE #ifndef _ASMLANGUAGE
@ -33,6 +29,9 @@ extern "C" {
#include <irq.h> #include <irq.h>
#include <sw_isr_table.h> #include <sw_isr_table.h>
#ifdef __cplusplus
extern "C" {
#endif
/** /**
* Configure a static interrupt. * Configure a static interrupt.
@ -210,10 +209,10 @@ static ALWAYS_INLINE void arch_nop(void)
__asm__ volatile("nop"); __asm__ volatile("nop");
} }
#endif /* _ASMLANGUAGE */
#ifdef __cplusplus #ifdef __cplusplus
} }
#endif #endif
#endif #endif /* _ASMLANGUAGE */
#endif /* ZEPHYR_INCLUDE_ARCH_NIOS2_ARCH_H_ */

8
include/arch/nios2/asm_inline_gcc.h
View file

@ -7,10 +7,6 @@
#ifndef ZEPHYR_INCLUDE_ARCH_NIOS2_ASM_INLINE_GCC_H_ #ifndef ZEPHYR_INCLUDE_ARCH_NIOS2_ASM_INLINE_GCC_H_
#define ZEPHYR_INCLUDE_ARCH_NIOS2_ASM_INLINE_GCC_H_ #define ZEPHYR_INCLUDE_ARCH_NIOS2_ASM_INLINE_GCC_H_
#ifdef __cplusplus
extern "C" {
#endif
/* /*
* The file must not be included directly * The file must not be included directly
* Include arch/cpu.h instead * Include arch/cpu.h instead
@ -21,8 +17,4 @@ extern "C" {
#include <toolchain.h> #include <toolchain.h>
#endif /* _ASMLANGUAGE */ #endif /* _ASMLANGUAGE */
#ifdef __cplusplus
}
#endif
#endif /* _ASM_INLINE_GCC_PUBLIC_GCC_H */ #endif /* _ASM_INLINE_GCC_PUBLIC_GCC_H */