2011-02-11 Ralf Corsépius <ralf.corsepius@rtems.org>

	* rtems/score/cpu.h, rtems/score/sparc.h:
	Use "__asm__" instead of "asm" for improved c99-compliance.

3 files changed, 16 insertions, 11 deletions

diff --git a/cpukit/score/cpu/sparc/ChangeLog b/cpukit/score/cpu/sparc/ChangeLog
index f66df09d55..7978cfc23c 100644
--- a/cpukit/score/cpu/sparc/ChangeLog
+++ b/cpukit/score/cpu/sparc/ChangeLog
@@ -1,3 +1,8 @@
+2011-02-11	Ralf Corsépius <ralf.corsepius@rtems.org>
+
+	* rtems/score/cpu.h, rtems/score/sparc.h:
+	Use "__asm__" instead of "asm" for improved c99-compliance.
+
 2010-11-16	Joel Sherrill <joel.sherrill@oarcorp.com>
 
 	* cpu.c: Remove unused variable reported by clang.
diff --git a/cpukit/score/cpu/sparc/rtems/score/cpu.h b/cpukit/score/cpu/sparc/rtems/score/cpu.h
index 3f2311fdfe..ddc5badfe5 100644
--- a/cpukit/score/cpu/sparc/rtems/score/cpu.h
+++ b/cpukit/score/cpu/sparc/rtems/score/cpu.h
@@ -770,7 +770,7 @@ void _CPU_Context_Initialize(
 
 #define _CPU_Context_Initialization_at_thread_begin() \
   do { \
-    asm volatile ("set _Thread_Handler,%%i7\n"::); \
+    __asm__ volatile ("set _Thread_Handler,%%i7\n"::); \
   } while (0)
 
 /*
@@ -822,7 +822,7 @@ void _CPU_Context_Initialize(
     uint32_t   level; \
     \
     level = sparc_disable_interrupts(); \
-    asm volatile ( "mov  %0, %%g1 " : "=r" (level) : "0" (level) ); \
+    __asm__ volatile ( "mov  %0, %%g1 " : "=r" (level) : "0" (level) ); \
     while (1); /* loop forever */ \
   } while (0)
 
diff --git a/cpukit/score/cpu/sparc/rtems/score/sparc.h b/cpukit/score/cpu/sparc/rtems/score/sparc.h
index f13470e0ac..9aefb20f4a 100644
--- a/cpukit/score/cpu/sparc/rtems/score/sparc.h
+++ b/cpukit/score/cpu/sparc/rtems/score/sparc.h
@@ -136,7 +136,7 @@ extern "C" {
 
 #define nop() \
   do { \
-    asm volatile ( "nop" ); \
+    __asm__ volatile ( "nop" ); \
   } while ( 0 )
 
 /*
@@ -146,12 +146,12 @@ extern "C" {
 #define sparc_get_psr( _psr ) \
   do { \
      (_psr) = 0; \
-     asm volatile( "rd %%psr, %0" :  "=r" (_psr) : "0" (_psr) ); \
+     __asm__ volatile( "rd %%psr, %0" :  "=r" (_psr) : "0" (_psr) ); \
   } while ( 0 )
 
 #define sparc_set_psr( _psr ) \
   do { \
-    asm volatile ( "mov  %0, %%psr " : "=r" ((_psr)) : "0" ((_psr)) ); \
+    __asm__ volatile ( "mov  %0, %%psr " : "=r" ((_psr)) : "0" ((_psr)) ); \
     nop(); \
     nop(); \
     nop(); \
@@ -164,12 +164,12 @@ extern "C" {
 #define sparc_get_tbr( _tbr ) \
   do { \
      (_tbr) = 0; /* to avoid unitialized warnings */ \
-     asm volatile( "rd %%tbr, %0" :  "=r" (_tbr) : "0" (_tbr) ); \
+     __asm__ volatile( "rd %%tbr, %0" :  "=r" (_tbr) : "0" (_tbr) ); \
   } while ( 0 )
 
 #define sparc_set_tbr( _tbr ) \
   do { \
-     asm volatile( "wr %0, 0, %%tbr" :  "=r" (_tbr) : "0" (_tbr) ); \
+     __asm__ volatile( "wr %0, 0, %%tbr" :  "=r" (_tbr) : "0" (_tbr) ); \
   } while ( 0 )
 
 /*
@@ -178,12 +178,12 @@ extern "C" {
 
 #define sparc_get_wim( _wim ) \
   do { \
-    asm volatile( "rd %%wim, %0" :  "=r" (_wim) : "0" (_wim) ); \
+    __asm__ volatile( "rd %%wim, %0" :  "=r" (_wim) : "0" (_wim) ); \
   } while ( 0 )
 
 #define sparc_set_wim( _wim ) \
   do { \
-    asm volatile( "wr %0, %%wim" :  "=r" (_wim) : "0" (_wim) ); \
+    __asm__ volatile( "wr %0, %%wim" :  "=r" (_wim) : "0" (_wim) ); \
     nop(); \
     nop(); \
     nop(); \
@@ -195,12 +195,12 @@ extern "C" {
 
 #define sparc_get_y( _y ) \
   do { \
-    asm volatile( "rd %%y, %0" :  "=r" (_y) : "0" (_y) ); \
+    __asm__ volatile( "rd %%y, %0" :  "=r" (_y) : "0" (_y) ); \
   } while ( 0 )
 
 #define sparc_set_y( _y ) \
   do { \
-    asm volatile( "wr %0, %%y" :  "=r" (_y) : "0" (_y) ); \
+    __asm__ volatile( "wr %0, %%y" :  "=r" (_y) : "0" (_y) ); \
   } while ( 0 )
 
 /*