From 67a7a2cc98b194c1cd4cc09194cbb5713d3f04ba Mon Sep 17 00:00:00 2001 From: Sebastian Huber Date: Mon, 14 Apr 2014 08:09:54 +0200 Subject: sparc: Use __leon__ multilib define --- c/src/lib/libbsp/sparc/leon3/smp/getcpuid.c | 3 ++- cpukit/score/cpu/sparc/rtems/score/cpu.h | 9 ++++++++- 2 files changed, 10 insertions(+), 2 deletions(-) diff --git a/c/src/lib/libbsp/sparc/leon3/smp/getcpuid.c b/c/src/lib/libbsp/sparc/leon3/smp/getcpuid.c index e44e4271ef..2ff31ebc8d 100644 --- a/c/src/lib/libbsp/sparc/leon3/smp/getcpuid.c +++ b/c/src/lib/libbsp/sparc/leon3/smp/getcpuid.c @@ -15,8 +15,9 @@ #include +#if !defined(__leon__) uint32_t _CPU_SMP_Get_current_processor( void ) { return _LEON3_Get_current_processor(); } - +#endif diff --git a/cpukit/score/cpu/sparc/rtems/score/cpu.h b/cpukit/score/cpu/sparc/rtems/score/cpu.h index b23f93c51d..e43b3bee5e 100644 --- a/cpukit/score/cpu/sparc/rtems/score/cpu.h +++ b/cpukit/score/cpu/sparc/rtems/score/cpu.h @@ -1163,7 +1163,14 @@ void _CPU_Context_restore( #if defined(RTEMS_SMP) uint32_t _CPU_SMP_Initialize( uint32_t configured_cpu_count ); - uint32_t _CPU_SMP_Get_current_processor( void ); + #if defined(__leon__) + static inline uint32_t _CPU_SMP_Get_current_processor( void ) + { + return _LEON3_Get_current_processor(); + } + #else + uint32_t _CPU_SMP_Get_current_processor( void ); + #endif void _CPU_SMP_Send_interrupt( uint32_t target_processor_index ); -- cgit v1.2.3