diff options
author | Ralf Corsepius <ralf.corsepius@rtems.org> | 2011-02-11 10:06:52 +0000 |
---|---|---|
committer | Ralf Corsepius <ralf.corsepius@rtems.org> | 2011-02-11 10:06:52 +0000 |
commit | 942978385f00cd78fb93fd2a24e4ea2b1ab7550e (patch) | |
tree | 8e756901fc0b7f80da45fc05ec8eac1eeb6c0e7e /c | |
parent | 2011-02-11 Ralf Corsépius <ralf.corsepius@rtems.org> (diff) | |
download | rtems-942978385f00cd78fb93fd2a24e4ea2b1ab7550e.tar.bz2 |
2011-02-11 Ralf Corsépius <ralf.corsepius@rtems.org>
* amba/amba.c, include/tm27.h, shmsupp/lock.c, startup/bspstart.c,
startup/spurious.c:
Use "__asm__" instead of "asm" for improved c99-compliance.
Diffstat (limited to 'c')
-rw-r--r-- | c/src/lib/libbsp/sparc/leon3/ChangeLog | 6 | ||||
-rw-r--r-- | c/src/lib/libbsp/sparc/leon3/amba/amba.c | 2 | ||||
-rw-r--r-- | c/src/lib/libbsp/sparc/leon3/include/tm27.h | 2 | ||||
-rw-r--r-- | c/src/lib/libbsp/sparc/leon3/shmsupp/lock.c | 4 | ||||
-rw-r--r-- | c/src/lib/libbsp/sparc/leon3/startup/bspstart.c | 2 | ||||
-rw-r--r-- | c/src/lib/libbsp/sparc/leon3/startup/spurious.c | 2 |
6 files changed, 12 insertions, 6 deletions
diff --git a/c/src/lib/libbsp/sparc/leon3/ChangeLog b/c/src/lib/libbsp/sparc/leon3/ChangeLog index 6a2b366a08..de763cf3ac 100644 --- a/c/src/lib/libbsp/sparc/leon3/ChangeLog +++ b/c/src/lib/libbsp/sparc/leon3/ChangeLog @@ -1,3 +1,9 @@ +2011-02-11 Ralf Corsépius <ralf.corsepius@rtems.org> + + * amba/amba.c, include/tm27.h, shmsupp/lock.c, startup/bspstart.c, + startup/spurious.c: + Use "__asm__" instead of "asm" for improved c99-compliance. + 2011-02-09 Ralf Corsépius <ralf.corsepius@rtems.org> * timer/timer.c: Include <rtems/btimer.h>. diff --git a/c/src/lib/libbsp/sparc/leon3/amba/amba.c b/c/src/lib/libbsp/sparc/leon3/amba/amba.c index 6f86e27ded..1932ceea1e 100644 --- a/c/src/lib/libbsp/sparc/leon3/amba/amba.c +++ b/c/src/lib/libbsp/sparc/leon3/amba/amba.c @@ -35,7 +35,7 @@ int LEON3_Cpu_Index = 0; unsigned int getasr17(void); -asm(" .text \n" +__asm__ (" .text \n" "getasr17: \n" "retl \n" "mov %asr17, %o0\n" diff --git a/c/src/lib/libbsp/sparc/leon3/include/tm27.h b/c/src/lib/libbsp/sparc/leon3/include/tm27.h index db26a82b19..dd47db72bb 100644 --- a/c/src/lib/libbsp/sparc/leon3/include/tm27.h +++ b/c/src/lib/libbsp/sparc/leon3/include/tm27.h @@ -39,7 +39,7 @@ set_vector( (handler), TEST_VECTOR, 1 ); #define Cause_tm27_intr() \ - asm volatile( "ta 0x10; nop " ); + __asm__ volatile( "ta 0x10; nop " ); #define Clear_tm27_intr() /* empty */ diff --git a/c/src/lib/libbsp/sparc/leon3/shmsupp/lock.c b/c/src/lib/libbsp/sparc/leon3/shmsupp/lock.c index b915f746ef..1cc3529fb0 100644 --- a/c/src/lib/libbsp/sparc/leon3/shmsupp/lock.c +++ b/c/src/lib/libbsp/sparc/leon3/shmsupp/lock.c @@ -41,7 +41,7 @@ void Shm_Initialize_lock( * a deadlock condition. */ -asm( +__asm__ ( ".text\n" ".align 4\n" "LEON3_Atomic_Swap:\n" @@ -65,7 +65,7 @@ void Shm_Lock( Shm_isrstat = isr_level; while ( lock_value ) { lock_value = LEON3_Atomic_Swap(lock_value, lockptr); -/* asm volatile( "" */ +/* __asm__ volatile( "" */ /* : "=r" (lockptr), "=r" (lock_value) */ /* : "0" (lockptr), "1" (lock_value) */ /* ); */ diff --git a/c/src/lib/libbsp/sparc/leon3/startup/bspstart.c b/c/src/lib/libbsp/sparc/leon3/startup/bspstart.c index fbe6b876ed..a4b9ffab46 100644 --- a/c/src/lib/libbsp/sparc/leon3/startup/bspstart.c +++ b/c/src/lib/libbsp/sparc/leon3/startup/bspstart.c @@ -41,7 +41,7 @@ extern void amba_initialize(void); static inline int set_snooping(void) { int tmp; - asm(" lda [%1] 2, %0 " + __asm__ (" lda [%1] 2, %0 " : "=r"(tmp) : "r"(0xC) ); diff --git a/c/src/lib/libbsp/sparc/leon3/startup/spurious.c b/c/src/lib/libbsp/sparc/leon3/startup/spurious.c index 62d38d3f0c..98e04ab9a3 100644 --- a/c/src/lib/libbsp/sparc/leon3/startup/spurious.c +++ b/c/src/lib/libbsp/sparc/leon3/startup/spurious.c @@ -120,7 +120,7 @@ rtems_isr bsp_spurious_handler( * What else can we do but stop ... */ - asm volatile( "mov 1, %g1; ta 0x0" ); + __asm__ volatile( "mov 1, %g1; ta 0x0" ); } /* |