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

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

3 files changed, 14 insertions, 14 deletions

diff --git a/cpukit/score/cpu/i386/rtems/score/cpu.h b/cpukit/score/cpu/i386/rtems/score/cpu.h
index a45db39e67..e793b3372c 100644
--- a/cpukit/score/cpu/i386/rtems/score/cpu.h
+++ b/cpukit/score/cpu/i386/rtems/score/cpu.h
@@ -354,8 +354,8 @@ SCORE_EXTERN void               *_CPU_Interrupt_stack_high;
 
 #define _CPU_ISR_Set_level( _new_level ) \
   { \
-    if ( _new_level ) asm volatile ( "cli" ); \
-    else              asm volatile ( "sti" ); \
+    if ( _new_level ) __asm__ volatile ( "cli" ); \
+    else              __asm__ volatile ( "sti" ); \
   }
 
 uint32_t   _CPU_ISR_Get_level( void );
@@ -456,7 +456,7 @@ uint32_t   _CPU_ISR_Get_level( void );
 
 #define _CPU_Fatal_halt( _error ) \
   { \
-    asm volatile ( "cli ; \
+    __asm__ volatile ( "cli ; \
                     movl %0,%%eax ; \
                     hlt" \
                     : "=r" ((_error)) : "0" ((_error)) \
@@ -483,7 +483,7 @@ uint32_t   _CPU_ISR_Get_level( void );
     \
     _output = 0; \
     \
-    asm volatile ( "bsfw    %0,%1 " \
+    __asm__ volatile ( "bsfw    %0,%1 " \
                     : "=r" (__value_in_register), "=r" (_output) \
                     : "0"  (__value_in_register), "1"  (_output) \
     ); \
diff --git a/cpukit/score/cpu/i386/rtems/score/i386.h b/cpukit/score/cpu/i386/rtems/score/i386.h
index 834337b9e5..2d8a8969cb 100644
--- a/cpukit/score/cpu/i386/rtems/score/i386.h
+++ b/cpukit/score/cpu/i386/rtems/score/i386.h
@@ -125,7 +125,7 @@ static inline uint32_t i386_swap_u32(
   uint32_t lout;
 
 #if (I386_HAS_BSWAP == 0)
-  asm volatile( "rorw  $8,%%ax;"
+  __asm__ volatile( "rorw  $8,%%ax;"
                 "rorl  $16,%0;"
                 "rorw  $8,%%ax" : "=a" (lout) : "0" (value) );
 #else
@@ -153,21 +153,21 @@ static inline unsigned int i386_get_cr0(void)
 {
   register unsigned int segment = 0;
 
-  asm volatile ( "movl %%cr0,%0" : "=r" (segment) : "0" (segment) );
+  __asm__ volatile ( "movl %%cr0,%0" : "=r" (segment) : "0" (segment) );
 
   return segment;
 }
 
 static inline void i386_set_cr0(unsigned int segment)
 {
-  asm volatile ( "movl %0,%%cr0" : "=r" (segment) : "0" (segment) );
+  __asm__ volatile ( "movl %0,%%cr0" : "=r" (segment) : "0" (segment) );
 }
 
 static inline unsigned int i386_get_cr2(void)
 {
   register unsigned int segment = 0;
 
-  asm volatile ( "movl %%cr2,%0" : "=r" (segment) : "0" (segment) );
+  __asm__ volatile ( "movl %%cr2,%0" : "=r" (segment) : "0" (segment) );
 
   return segment;
 }
@@ -176,14 +176,14 @@ static inline unsigned int i386_get_cr3(void)
 {
   register unsigned int segment = 0;
 
-  asm volatile ( "movl %%cr3,%0" : "=r" (segment) : "0" (segment) );
+  __asm__ volatile ( "movl %%cr3,%0" : "=r" (segment) : "0" (segment) );
 
   return segment;
 }
 
 static inline void i386_set_cr3(unsigned int segment)
 {
-  asm volatile ( "movl %0,%%cr3" : "=r" (segment) : "0" (segment) );
+  __asm__ volatile ( "movl %0,%%cr3" : "=r" (segment) : "0" (segment) );
 }
 
 /* routines */
diff --git a/cpukit/score/cpu/i386/rtems/score/interrupts.h b/cpukit/score/cpu/i386/rtems/score/interrupts.h
index 89034a00f0..b6b541fb0e 100644
--- a/cpukit/score/cpu/i386/rtems/score/interrupts.h
+++ b/cpukit/score/cpu/i386/rtems/score/interrupts.h
@@ -36,7 +36,7 @@ typedef int  (*rtems_raw_irq_is_enabled)	(const struct __rtems_raw_irq_connect_d
 
 #define i386_disable_interrupts( _level ) \
   { \
-    asm volatile ( "pushf ; \
+    __asm__ volatile ( "pushf ; \
                     cli ; \
                     pop %0" \
                    : "=rm" ((_level)) \
@@ -45,7 +45,7 @@ typedef int  (*rtems_raw_irq_is_enabled)	(const struct __rtems_raw_irq_connect_d
 
 #define i386_enable_interrupts( _level )  \
   { \
-    asm volatile ( "push %0 ; \
+    __asm__ volatile ( "push %0 ; \
                     popf" \
                     : : "rm" ((_level)) : "cc" \
     ); \
@@ -53,7 +53,7 @@ typedef int  (*rtems_raw_irq_is_enabled)	(const struct __rtems_raw_irq_connect_d
 
 #define i386_flash_interrupts( _level ) \
   { \
-    asm volatile ( "push %0 ; \
+    __asm__ volatile ( "push %0 ; \
                     popf ; \
                     cli" \
                     : : "rm" ((_level)) : "cc" \
@@ -64,7 +64,7 @@ typedef int  (*rtems_raw_irq_is_enabled)	(const struct __rtems_raw_irq_connect_d
   do { \
     register uint32_t   _eflags; \
     \
-    asm volatile ( "pushf ; \
+    __asm__ volatile ( "pushf ; \
                     pop %0" \
                     : "=rm" ((_eflags)) \
     ); \