diff options
| author | Sebastian Huber <sebastian.huber@embedded-brains.de> | 2014-04-14 08:09:54 +0200 |
|---|---|---|
| committer | Sebastian Huber <sebastian.huber@embedded-brains.de> | 2014-04-14 08:37:04 +0200 |
| commit | 67a7a2cc98b194c1cd4cc09194cbb5713d3f04ba (patch) | |
| tree | 8632940261e07795fb70ec747fc242cbdcfeb37d | |
| parent | sparc64/niagara: add bsp_fatal_handler to terminate execution (diff) | |
| download | rtems-67a7a2cc98b194c1cd4cc09194cbb5713d3f04ba.tar.bz2 | |
sparc: Use __leon__ multilib define
| -rw-r--r-- | c/src/lib/libbsp/sparc/leon3/smp/getcpuid.c | 3 | ||||
| -rw-r--r-- | 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 <rtems/score/cpu.h> +#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 ); |