summaryrefslogtreecommitdiff
path: root/libc/sysdeps
diff options
context:
space:
mode:
authorHaavard Skinnemoen <haavard.skinnemoen@atmel.com>2008-07-23 08:05:45 +0000
committerHaavard Skinnemoen <haavard.skinnemoen@atmel.com>2008-07-23 08:05:45 +0000
commit40ee4cb9496ed037957db9790e5bd87604d45fe5 (patch)
treecfe2869edccba2c8a51cd583e24e1c77bca9a5b0 /libc/sysdeps
parent21c9dcf8b345401bdf290f34a144db80753b1b9f (diff)
avr32: Put underscores around asm, inline, etc.
This fixes build breakage introduced in r22868.
Diffstat (limited to 'libc/sysdeps')
-rw-r--r--libc/sysdeps/linux/avr32/bits/byteswap.h4
-rw-r--r--libc/sysdeps/linux/avr32/bits/syscalls.h16
2 files changed, 10 insertions, 10 deletions
diff --git a/libc/sysdeps/linux/avr32/bits/byteswap.h b/libc/sysdeps/linux/avr32/bits/byteswap.h
index 1c030b976..f0bea4cea 100644
--- a/libc/sysdeps/linux/avr32/bits/byteswap.h
+++ b/libc/sysdeps/linux/avr32/bits/byteswap.h
@@ -18,7 +18,7 @@
# define __bswap_16(x) (__extension__ __builtin_bswap_16(x))
#else
/* This is better than nothing. */
-static __inline unsigned short int
+static __inline__ unsigned short int
__bswap_16 (unsigned short int __bsx)
{
return ((((__bsx) >> 8) & 0xff) | (((__bsx) & 0xff) << 8));
@@ -29,7 +29,7 @@ __bswap_16 (unsigned short int __bsx)
#if defined __GNUC__
# define __bswap_32(x) (__extension__ __builtin_bswap_32(x))
#else
-static __inline unsigned int
+static __inline__ unsigned int
__bswap_32 (unsigned int __bsx)
{
return ((((__bsx) & 0xff000000) >> 24) | (((__bsx) & 0x00ff0000) >> 8) |
diff --git a/libc/sysdeps/linux/avr32/bits/syscalls.h b/libc/sysdeps/linux/avr32/bits/syscalls.h
index 22ac05960..ff5d1a7be 100644
--- a/libc/sysdeps/linux/avr32/bits/syscalls.h
+++ b/libc/sysdeps/linux/avr32/bits/syscalls.h
@@ -95,10 +95,10 @@
#undef INTERNAL_SYSCALL
#define INTERNAL_SYSCALL(name, err, nr, args...) \
({ \
- register int _a1 asm ("r12"); \
- register int _scno asm("r8") = SYS_ify(name); \
+ register int _a1 __asm__("r12"); \
+ register int _scno __asm__("r8") = SYS_ify(name); \
LOAD_ARGS_##nr (args); \
- asm volatile ("scall /* syscall " #name " */" \
+ __asm__ __volatile__("scall /* syscall " #name " */" \
: "=r" (_a1) \
: "r"(_scno) ASM_ARGS_##nr \
: "cc", "memory"); \
@@ -119,23 +119,23 @@
LOAD_ARGS_0()
#define ASM_ARGS_1 ASM_ARGS_0, "r"(_a1)
#define LOAD_ARGS_2(a1, a2) \
- register int _a2 asm("r11") = (int)(a2); \
+ register int _a2 __asm__("r11") = (int)(a2); \
LOAD_ARGS_1(a1)
#define ASM_ARGS_2 ASM_ARGS_1, "r"(_a2)
#define LOAD_ARGS_3(a1, a2, a3) \
- register int _a3 asm("r10") = (int)(a3); \
+ register int _a3 __asm__("r10") = (int)(a3); \
LOAD_ARGS_2(a1, a2)
#define ASM_ARGS_3 ASM_ARGS_2, "r"(_a3)
#define LOAD_ARGS_4(a1, a2, a3, a4) \
- register int _a4 asm("r9") = (int)(a4); \
+ register int _a4 __asm__("r9") = (int)(a4); \
LOAD_ARGS_3(a1, a2, a3)
#define ASM_ARGS_4 ASM_ARGS_3, "r"(_a4)
#define LOAD_ARGS_5(a1, a2, a3, a4, a5) \
- register int _a5 asm("r5") = (int)(a5); \
+ register int _a5 __asm__("r5") = (int)(a5); \
LOAD_ARGS_4(a1, a2, a3, a4)
#define ASM_ARGS_5 ASM_ARGS_4, "r"(_a5)
#define LOAD_ARGS_6(a1, a2, a3, a4, a5, a6) \
- register int _a6 asm("r3") = (int)(a6); \
+ register int _a6 __asm__("r3") = (int)(a6); \
LOAD_ARGS_5(a1, a2, a3, a4, a5)
#define ASM_ARGS_6 ASM_ARGS_5, "r"(_a6)