diff options
Diffstat (limited to 'c/src')
| -rw-r--r-- | c/src/lib/libcpu/powerpc/ChangeLog | 4 | ||||
| -rw-r--r-- | c/src/lib/libcpu/powerpc/mpc8xx/exceptions/raw_exception.c | 1 | ||||
| -rw-r--r-- | c/src/lib/libcpu/powerpc/shared/include/cpu.h | 3 |
3 files changed, 7 insertions, 1 deletions
diff --git a/c/src/lib/libcpu/powerpc/ChangeLog b/c/src/lib/libcpu/powerpc/ChangeLog index 5ca295aede..711bbf1617 100644 --- a/c/src/lib/libcpu/powerpc/ChangeLog +++ b/c/src/lib/libcpu/powerpc/ChangeLog @@ -1,5 +1,9 @@ 2001-04-17 Joel Sherrill <joel@OARcorp.com> + * shared/include/cpu.h: Added ifndef ASM. + +2001-04-17 Joel Sherrill <joel@OARcorp.com> + * ChangeLog: Corrected paths on past few commits. 2002-04-16 Ralf Corsepius <corsepiu@faw.uni-ulm.de> diff --git a/c/src/lib/libcpu/powerpc/mpc8xx/exceptions/raw_exception.c b/c/src/lib/libcpu/powerpc/mpc8xx/exceptions/raw_exception.c index d1dfde1f12..c983e5c26d 100644 --- a/c/src/lib/libcpu/powerpc/mpc8xx/exceptions/raw_exception.c +++ b/c/src/lib/libcpu/powerpc/mpc8xx/exceptions/raw_exception.c @@ -23,6 +23,7 @@ #include <rtems/score/cpu.h> #include <libcpu/raw_exception.h> #include <libcpu/cpu.h> +#include <libcpu/cpuIdent.h> static rtems_raw_except_connect_data* raw_except_table; static rtems_raw_except_connect_data default_raw_except_entry; diff --git a/c/src/lib/libcpu/powerpc/shared/include/cpu.h b/c/src/lib/libcpu/powerpc/shared/include/cpu.h index fa68d6604e..7d61aef09b 100644 --- a/c/src/lib/libcpu/powerpc/shared/include/cpu.h +++ b/c/src/lib/libcpu/powerpc/shared/include/cpu.h @@ -179,6 +179,7 @@ n: * Routines to access the time base register */ +#ifndef ASM static inline unsigned long long PPC_Get_timebase_register( void ) { unsigned long tbr_low; @@ -209,7 +210,7 @@ static inline void PPC_Set_timebase_register (unsigned long long tbr) asm volatile( "mtspr 285, %0" : : "r" (tbr_high)); } -#endif +#endif /* ASM */ #define _CPU_MSR_GET( _msr_value ) \ do { \ |