summaryrefslogtreecommitdiffstats
path: root/libc/sysdeps/linux/arm
diff options
context:
space:
mode:
authorCarmelo Amoroso <carmelo.amoroso@st.com>2008-07-31 15:21:24 +0000
committerCarmelo Amoroso <carmelo.amoroso@st.com>2008-07-31 15:21:24 +0000
commitdd7d7e3f138d1835d153c316f3d771e40dc641ba (patch)
tree7427232d1e9759028490f843152a83a4bbbab7db /libc/sysdeps/linux/arm
parent89ed2cccba266f7738ceb445e4d43103c08cbe75 (diff)
downloaduClibc-alpine-dd7d7e3f138d1835d153c316f3d771e40dc641ba.tar.bz2
uClibc-alpine-dd7d7e3f138d1835d153c316f3d771e40dc641ba.tar.xz
Synch with trunk at rev 22997.
Basically trailing whitespaces removal, fix non standard keywords asm -> __asm__ inline -> __inline__ and some minor changes on trunk. Signed-off-by: Carmelo Amoroso <carmelo.amoroso@st.com>
Diffstat (limited to 'libc/sysdeps/linux/arm')
-rw-r--r--libc/sysdeps/linux/arm/bits/endian.h2
-rw-r--r--libc/sysdeps/linux/arm/bits/kernel_stat.h4
-rw-r--r--libc/sysdeps/linux/arm/bits/kernel_types.h4
-rw-r--r--libc/sysdeps/linux/arm/bits/syscalls.h14
-rw-r--r--libc/sysdeps/linux/arm/ioperm.c2
-rw-r--r--libc/sysdeps/linux/arm/iopl.c2
-rw-r--r--libc/sysdeps/linux/arm/mmap.c6
7 files changed, 17 insertions, 17 deletions
diff --git a/libc/sysdeps/linux/arm/bits/endian.h b/libc/sysdeps/linux/arm/bits/endian.h
index 27946cdee..6e9967db5 100644
--- a/libc/sysdeps/linux/arm/bits/endian.h
+++ b/libc/sysdeps/linux/arm/bits/endian.h
@@ -13,7 +13,7 @@
CPU endianness. VFP floating point units use the same endianness
as the rest of the system. */
#if defined __VFP_FP__ || defined __MAVERICK__
-# define __FLOAT_WORD_ORDER __BYTE_ORDER
+# define __FLOAT_WORD_ORDER __BYTE_ORDER
#else
# define __FLOAT_WORD_ORDER __BIG_ENDIAN
#endif
diff --git a/libc/sysdeps/linux/arm/bits/kernel_stat.h b/libc/sysdeps/linux/arm/bits/kernel_stat.h
index b686c479a..ebac6f5ff 100644
--- a/libc/sysdeps/linux/arm/bits/kernel_stat.h
+++ b/libc/sysdeps/linux/arm/bits/kernel_stat.h
@@ -5,8 +5,8 @@
#error bits/kernel_stat.h is for internal uClibc use only!
#endif
-/* This file provides whatever this particular arch's kernel thinks
- * struct kernel_stat should look like... It turns out each arch has a
+/* This file provides whatever this particular arch's kernel thinks
+ * struct kernel_stat should look like... It turns out each arch has a
* different opinion on the subject... */
#define STAT_HAVE_NSEC 1
diff --git a/libc/sysdeps/linux/arm/bits/kernel_types.h b/libc/sysdeps/linux/arm/bits/kernel_types.h
index d7a1b1530..766a30621 100644
--- a/libc/sysdeps/linux/arm/bits/kernel_types.h
+++ b/libc/sysdeps/linux/arm/bits/kernel_types.h
@@ -1,6 +1,6 @@
/* Note that we use the exact same include guard #define names
- * as asm/posix_types.h. This will avoid gratuitous conflicts
- * with the posix_types.h kernel header, and will ensure that
+ * as asm/posix_types.h. This will avoid gratuitous conflicts
+ * with the posix_types.h kernel header, and will ensure that
* our private content, and not the kernel header, will win.
* -Erik
*/
diff --git a/libc/sysdeps/linux/arm/bits/syscalls.h b/libc/sysdeps/linux/arm/bits/syscalls.h
index 85c6cbd55..2d2e0f0a4 100644
--- a/libc/sysdeps/linux/arm/bits/syscalls.h
+++ b/libc/sysdeps/linux/arm/bits/syscalls.h
@@ -5,7 +5,7 @@
#endif
/*
- Some of the sneaky macros in the code were taken from
+ Some of the sneaky macros in the code were taken from
glibc-2.3.2/sysdeps/unix/sysv/linux/arm/sysdep.h
*/
@@ -65,7 +65,7 @@ return (type) (INLINE_SYSCALL(name, 3, arg1, arg2, arg3)); \
type name (type1 arg1, type2 arg2, type3 arg3, type4 arg4) \
{ \
return (type) (INLINE_SYSCALL(name, 4, arg1, arg2, arg3, arg4)); \
-}
+}
#undef _syscall5
#define _syscall5(type,name,type1,arg1,type2,arg2,type3,arg3,type4,arg4, \
@@ -145,13 +145,13 @@ return (type) (INLINE_SYSCALL(name, 7, arg1, arg2, arg3, arg4, arg5, arg6, arg7)
{ \
int _sys_buf[2]; \
register int _a1 __asm__ ("a1"); \
- register int *_v3 asm ("v3") = _sys_buf; \
+ register int *_v3 __asm__ ("v3") = _sys_buf; \
*_v3 = (int) (SYS_ify(name)); \
LOAD_ARGS_##nr (args) \
- asm volatile ("str r7, [v3, #4]\n" \
- "\tldr r7, [v3]\n" \
- "\tswi 0 @ syscall " #name "\n" \
- "\tldr r7, [v3, #4]" \
+ __asm__ __volatile__ ("str r7, [v3, #4]\n" \
+ "\tldr r7, [v3]\n" \
+ "\tswi 0 @ syscall " #name "\n" \
+ "\tldr r7, [v3, #4]" \
: "=r" (_a1) \
: "r" (_v3) ASM_ARGS_##nr \
: "memory"); \
diff --git a/libc/sysdeps/linux/arm/ioperm.c b/libc/sysdeps/linux/arm/ioperm.c
index 0229f871d..708e8ec49 100644
--- a/libc/sysdeps/linux/arm/ioperm.c
+++ b/libc/sysdeps/linux/arm/ioperm.c
@@ -117,7 +117,7 @@ init_iosys (void)
{
char systype[256];
int i, n;
-
+
#if LINUX_VERSION_CODE < 132119
static int iobase_name[] = { CTL_BUS, BUS_ISA, BUS_ISA_PORT_BASE };
static int ioshift_name[] = { CTL_BUS, BUS_ISA, BUS_ISA_PORT_SHIFT };
diff --git a/libc/sysdeps/linux/arm/iopl.c b/libc/sysdeps/linux/arm/iopl.c
index 552ba6c67..654a4158f 100644
--- a/libc/sysdeps/linux/arm/iopl.c
+++ b/libc/sysdeps/linux/arm/iopl.c
@@ -25,7 +25,7 @@ libc_hidden_proto(ioperm)
#define MAX_PORT 0x10000
-int iopl(int level)
+int iopl(int level)
{
if (level > 3) {
__set_errno(EINVAL);
diff --git a/libc/sysdeps/linux/arm/mmap.c b/libc/sysdeps/linux/arm/mmap.c
index 440cb17b1..47a29f4ae 100644
--- a/libc/sysdeps/linux/arm/mmap.c
+++ b/libc/sysdeps/linux/arm/mmap.c
@@ -16,7 +16,7 @@
libc_hidden_proto (mmap)
#if defined (__UCLIBC_MMAP_HAS_6_ARGS__) && defined (__NR_mmap)
#define __NR__mmap __NR_mmap
-static inline _syscall6 (__ptr_t, _mmap, __ptr_t, addr, size_t, len,
+static __inline__ _syscall6 (__ptr_t, _mmap, __ptr_t, addr, size_t, len,
int, prot, int, flags, int, fd, __off_t, offset);
__ptr_t mmap(__ptr_t addr, size_t len, int prot,
int flags, int fd, __off_t offset)
@@ -32,7 +32,7 @@ __ptr_t mmap(__ptr_t addr, size_t len, int prot,
# define MMAP2_PAGE_SHIFT 12
#endif
-static inline _syscall6 (__ptr_t, _mmap, __ptr_t, addr, size_t, len,
+static __inline__ _syscall6 (__ptr_t, _mmap, __ptr_t, addr, size_t, len,
int, prot, int, flags, int, fd, __off_t, offset);
__ptr_t mmap(__ptr_t addr, size_t len, int prot,
int flags, int fd, __off_t offset)
@@ -53,7 +53,7 @@ __ptr_t mmap(__ptr_t addr, size_t len, int prot,
}
#elif defined (__NR_mmap)
# define __NR__mmap __NR_mmap
-static inline _syscall1(__ptr_t, _mmap, unsigned long *, buffer);
+static __inline__ _syscall1(__ptr_t, _mmap, unsigned long *, buffer);
__ptr_t mmap(__ptr_t addr, size_t len, int prot,
int flags, int fd, __off_t offset)
{