summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDaniel Cederman <cederman@gaisler.com>2014-03-13 14:26:00 +0100
committerJoel Sherrill <joel.sherrill@oarcorp.com>2014-03-21 09:57:25 -0500
commit324032549efb11a89c1c1cf8080b9d2e93990581 (patch)
treefa400074a14f6b2799e00c51de2ce3b425bbda18
parentbsps/sparc: Make spurious trap handler function static. (diff)
downloadrtems-324032549efb11a89c1c1cf8080b9d2e93990581.tar.bz2
bsps/sparc: Change asm to __asm__ to compile with -pedantic.
-rw-r--r--c/src/lib/libbsp/sparc/leon2/include/leon.h2
-rw-r--r--c/src/lib/libbsp/sparc/leon3/console/printk_support.c8
-rw-r--r--c/src/lib/libbsp/sparc/leon3/include/leon.h2
3 files changed, 6 insertions, 6 deletions
diff --git a/c/src/lib/libbsp/sparc/leon2/include/leon.h b/c/src/lib/libbsp/sparc/leon2/include/leon.h
index 3936e822e0..d122f29135 100644
--- a/c/src/lib/libbsp/sparc/leon2/include/leon.h
+++ b/c/src/lib/libbsp/sparc/leon2/include/leon.h
@@ -395,7 +395,7 @@ static __inline__ int bsp_irq_fixup(int irq)
static inline unsigned int leon_r32_no_cache(uintptr_t addr)
{
unsigned int tmp;
- asm volatile (" lda [%1] 1, %0\n" : "=r"(tmp) : "r"(addr));
+ __asm__ volatile (" lda [%1] 1, %0\n" : "=r"(tmp) : "r"(addr));
return tmp;
}
diff --git a/c/src/lib/libbsp/sparc/leon3/console/printk_support.c b/c/src/lib/libbsp/sparc/leon3/console/printk_support.c
index d4cc5a0955..35fb4b52e5 100644
--- a/c/src/lib/libbsp/sparc/leon3/console/printk_support.c
+++ b/c/src/lib/libbsp/sparc/leon3/console/printk_support.c
@@ -89,10 +89,10 @@ void apbuart_outbyte_polled(
send:
while ( (regs->status & LEON_REG_UART_STATUS_THE) == 0 ) {
/* Lower bus utilization while waiting for UART */
- asm volatile ("nop"::); asm volatile ("nop"::);
- asm volatile ("nop"::); asm volatile ("nop"::);
- asm volatile ("nop"::); asm volatile ("nop"::);
- asm volatile ("nop"::); asm volatile ("nop"::);
+ __asm__ volatile ("nop"::); __asm__ volatile ("nop"::);
+ __asm__ volatile ("nop"::); __asm__ volatile ("nop"::);
+ __asm__ volatile ("nop"::); __asm__ volatile ("nop"::);
+ __asm__ volatile ("nop"::); __asm__ volatile ("nop"::);
}
regs->data = (unsigned int) ch;
diff --git a/c/src/lib/libbsp/sparc/leon3/include/leon.h b/c/src/lib/libbsp/sparc/leon3/include/leon.h
index 537a0ef86c..6d2434d36c 100644
--- a/c/src/lib/libbsp/sparc/leon3/include/leon.h
+++ b/c/src/lib/libbsp/sparc/leon3/include/leon.h
@@ -291,7 +291,7 @@ extern rtems_interrupt_lock LEON3_IrqCtrl_Lock;
static inline unsigned int leon_r32_no_cache(uintptr_t addr)
{
unsigned int tmp;
- asm volatile (" lda [%1] 1, %0\n" : "=r"(tmp) : "r"(addr));
+ __asm__ volatile (" lda [%1] 1, %0\n" : "=r"(tmp) : "r"(addr));
return tmp;
}