From 69722335e5910a1817f88fb3b544f0059a5228d1 Mon Sep 17 00:00:00 2001 From: Ralf Corsepius Date: Fri, 11 Feb 2011 10:06:49 +0000 Subject: [PATCH] =?UTF-8?q?2011-02-11=09Ralf=20Cors=C3=A9pius=20?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * cchip/cchip.c, include/tm27.h, startup/spurious.c: Use "__asm__" instead of "asm" for improved c99-compliance. --- c/src/lib/libbsp/sparc/leon2/ChangeLog | 5 +++++ c/src/lib/libbsp/sparc/leon2/cchip/cchip.c | 2 +- c/src/lib/libbsp/sparc/leon2/include/tm27.h | 2 +- c/src/lib/libbsp/sparc/leon2/startup/spurious.c | 2 +- 4 files changed, 8 insertions(+), 3 deletions(-) diff --git a/c/src/lib/libbsp/sparc/leon2/ChangeLog b/c/src/lib/libbsp/sparc/leon2/ChangeLog index c047190d90..cc51826fec 100644 --- a/c/src/lib/libbsp/sparc/leon2/ChangeLog +++ b/c/src/lib/libbsp/sparc/leon2/ChangeLog @@ -1,3 +1,8 @@ +2011-02-11 Ralf Corsépius + + * cchip/cchip.c, include/tm27.h, startup/spurious.c: + Use "__asm__" instead of "asm" for improved c99-compliance. + 2011-02-09 Ralf Corsépius * timer/timer.c: Include . diff --git a/c/src/lib/libbsp/sparc/leon2/cchip/cchip.c b/c/src/lib/libbsp/sparc/leon2/cchip/cchip.c index e0c6364c66..59c17dd9ff 100644 --- a/c/src/lib/libbsp/sparc/leon2/cchip/cchip.c +++ b/c/src/lib/libbsp/sparc/leon2/cchip/cchip.c @@ -38,7 +38,7 @@ void cchip1_set_isr(void *handler, int irqno, void *arg); #define READ_REG(address) _READ_REG((unsigned int)address) static __inline__ unsigned int _READ_REG(unsigned int addr) { unsigned int tmp; - asm("lda [%1]1, %0 " + __asm__ ("lda [%1]1, %0 " : "=r"(tmp) : "r"(addr) ); diff --git a/c/src/lib/libbsp/sparc/leon2/include/tm27.h b/c/src/lib/libbsp/sparc/leon2/include/tm27.h index db26a82b19..dd47db72bb 100644 --- a/c/src/lib/libbsp/sparc/leon2/include/tm27.h +++ b/c/src/lib/libbsp/sparc/leon2/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/leon2/startup/spurious.c b/c/src/lib/libbsp/sparc/leon2/startup/spurious.c index ef4bf8053b..d745aab0f7 100644 --- a/c/src/lib/libbsp/sparc/leon2/startup/spurious.c +++ b/c/src/lib/libbsp/sparc/leon2/startup/spurious.c @@ -109,7 +109,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" ); } /*