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>

4 files changed, 12 insertions, 12 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");					\