michaelh/zephyr
1
0
Fork 0
Code Releases Activity

arch: x86: add extern "C" to arch.h

Browse source 
Without this builds for qemu_x86 can't invoke k_cycle_get_32()
because z_timer_cycle_get_32() is installed with a mangled name.

Signed-off-by: Peter Bigot <peter.bigot@nordicsemi.no>
This commit is contained in:
Peter Bigot 2020-06-09 10:53:37 -05:00 • committed by Anas Nashif
commit 4bc1ca9e7e
1 changed files with 16 additions and 0 deletions
Download patch file Download diff file Expand all files Collapse all files

16
include/arch/x86/arch.h
View file

@ -23,6 +23,10 @@
#include <arch/x86/mmustructs.h>
#include <arch/x86/thread_stack.h>
#ifdef __cplusplus
extern "C" {
#endif
static ALWAYS_INLINE void arch_irq_unlock(unsigned int key)
{
if ((key & 0x00000200U) != 0U) { /* 'IF' bit */
@ -204,6 +208,10 @@ extern unsigned char _irq_to_interrupt_vector[];
#endif /* _ASMLANGUAGE */
#ifdef __cplusplus
}
#endif
#include <drivers/interrupt_controller/sysapic.h>
#ifdef CONFIG_X86_64
@ -214,6 +222,10 @@ extern unsigned char _irq_to_interrupt_vector[];
#include <arch/common/ffs.h>
#ifdef __cplusplus
extern "C" {
#endif
#ifndef _ASMLANGUAGE
extern void arch_irq_enable(unsigned int irq);
@ -282,4 +294,8 @@ static ALWAYS_INLINE void arch_nop(void)
#endif /* _ASMLANGUAGE */
#ifdef __cplusplus
}
#endif
#endif /* ZEPHYR_INCLUDE_ARCH_X86_ARCH_H_ */