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

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

6 files changed, 16 insertions, 10 deletions

diff --git a/cpukit/score/cpu/m32c/ChangeLog b/cpukit/score/cpu/m32c/ChangeLog
index 03f50547ef..1c53c04640 100644
--- a/cpukit/score/cpu/m32c/ChangeLog
+++ b/cpukit/score/cpu/m32c/ChangeLog
@@ -1,3 +1,9 @@
+2011-02-11	Ralf Corsépius <ralf.corsepius@rtems.org>
+
+	* context_init.c, cpu.c, varvects.h, rtems/score/cpu.h,
+	rtems/score/m32c.h:
+	Use "__asm__" instead of "asm" for improved c99-compliance.
+
 2010-10-21	Joel Sherrill <joel.sherrill@oarcorp.com>
 
 	* rtems/score/cpu.h: Add RTEMS_COMPILER_NO_RETURN_ATTRIBUTE to
diff --git a/cpukit/score/cpu/m32c/context_init.c b/cpukit/score/cpu/m32c/context_init.c
index d6f9f703c1..e79fb0e9c9 100644
--- a/cpukit/score/cpu/m32c/context_init.c
+++ b/cpukit/score/cpu/m32c/context_init.c
@@ -36,7 +36,7 @@ typedef struct {
   #define _get_sb( _sb )
 #else
   #define _get_sb( _sb ) \
-    asm volatile( "stc sb, %0" : "=r" (_sb))
+    __asm__ volatile( "stc sb, %0" : "=r" (_sb))
 #endif
 
 void _CPU_Context_Initialize(
diff --git a/cpukit/score/cpu/m32c/cpu.c b/cpukit/score/cpu/m32c/cpu.c
index 41100e0d96..b5cb491a4b 100644
--- a/cpukit/score/cpu/m32c/cpu.c
+++ b/cpukit/score/cpu/m32c/cpu.c
@@ -33,7 +33,7 @@
 void _CPU_Initialize(void)
 {
   #if !defined(__r8c_cpu__)
-    asm volatile( "ldc    #__var_vects,intb" );
+    __asm__ volatile( "ldc    #__var_vects,intb" );
   #endif
 }
 
diff --git a/cpukit/score/cpu/m32c/rtems/score/cpu.h b/cpukit/score/cpu/m32c/rtems/score/cpu.h
index fbb115e4a7..4d75c0a930 100644
--- a/cpukit/score/cpu/m32c/rtems/score/cpu.h
+++ b/cpukit/score/cpu/m32c/rtems/score/cpu.h
@@ -674,7 +674,7 @@ typedef struct {
     int _flg; \
     m32c_get_flg( _flg ); \
     _isr_cookie = _flg; \
-    asm volatile( "fclr I" ); \
+    __asm__ volatile( "fclr I" ); \
   } while(0)
 
 /**
@@ -712,7 +712,7 @@ typedef struct {
   do { \
     int _flg = (int) (_isr_cookie); \
     m32c_set_flg( _flg ); \
-    asm volatile( "fclr I" ); \
+    __asm__ volatile( "fclr I" ); \
   } while(0)
 
 /**
@@ -734,8 +734,8 @@ typedef struct {
  */
 #define _CPU_ISR_Set_level( _new_level ) \
   do { \
-    if (_new_level) asm volatile( "fclr I" ); \
-    else            asm volatile( "fset I" ); \
+    if (_new_level) __asm__ volatile( "fclr I" ); \
+    else            __asm__ volatile( "fset I" ); \
   } while(0)
 
 /**
diff --git a/cpukit/score/cpu/m32c/rtems/score/m32c.h b/cpukit/score/cpu/m32c/rtems/score/m32c.h
index 827898eb4a..0c3fe43b7f 100644
--- a/cpukit/score/cpu/m32c/rtems/score/m32c.h
+++ b/cpukit/score/cpu/m32c/rtems/score/m32c.h
@@ -60,10 +60,10 @@ extern "C" {
 #define CPU_NAME "m32c"
 
 #define m32c_get_flg( _flg ) \
-  asm volatile( "stc flg, %0" : "=r" (_flg))
+  __asm__ volatile( "stc flg, %0" : "=r" (_flg))
 
 #define m32c_set_flg( _flg ) \
-  asm volatile( "ldc %1, flg" : "=r" (_flg) : "r" (_flg) )
+  __asm__ volatile( "ldc %1, flg" : "=r" (_flg) : "r" (_flg) )
 
 #ifdef __cplusplus
 }
diff --git a/cpukit/score/cpu/m32c/varvects.h b/cpukit/score/cpu/m32c/varvects.h
index 655f9b148d..30884edbd8 100644
--- a/cpukit/score/cpu/m32c/varvects.h
+++ b/cpukit/score/cpu/m32c/varvects.h
@@ -42,8 +42,8 @@ extern _m32c_interrupt_func _var_vects[];
 #if defined(__r8c_cpu__) || defined (__m16c_cpu__)
 
 #define _set_var_vect(f,n) \
-  { asm ("mov.w #%%lo16(%d0),__var_vects+%d1" : : "s" (f), "g" (n*4));	\
-    asm ("mov.w #%%hi16(%d0),__var_vects+%d1" : : "s" (f), "g" (n*4+2)); }
+  { __asm__ ("mov.w #%%lo16(%d0),__var_vects+%d1" : : "s" (f), "g" (n*4));	\
+    __asm__ ("mov.w #%%hi16(%d0),__var_vects+%d1" : : "s" (f), "g" (n*4+2)); }
 
 #else