Browse Source

whitespace fixes

Signed-off-by: Austin Foxley <austinf@cetoncorp.com>
Austin Foxley 15 years ago
parent
commit
0f3e8be773
64 changed files with 97 additions and 130 deletions
  1. 35 35
      libc/inet/socketcalls.c
  2. 1 1
      libc/misc/internals/__uClibc_main.c
  3. 0 1
      libc/misc/pthread/tsd.c
  4. 1 1
      libc/stdlib/system.c
  5. 1 1
      libc/sysdeps/linux/common/Makefile.in
  6. 0 1
      libc/sysdeps/linux/common/__rt_sigwaitinfo.c
  7. 2 2
      libc/sysdeps/linux/common/__syscall_fcntl.c
  8. 1 1
      libc/sysdeps/linux/common/nanosleep.c
  9. 1 1
      libc/sysdeps/linux/common/poll.c
  10. 0 1
      libc/sysdeps/linux/mips/clone.S
  11. 3 3
      libc/sysdeps/linux/mips/syscall_error.S
  12. 1 1
      libc/sysdeps/linux/sh/bits/atomic.h
  13. 3 3
      libc/sysdeps/linux/sh/clone.S
  14. 6 6
      libc/sysdeps/linux/sh/pread_write.c
  15. 1 1
      libc/sysdeps/linux/sh/setjmp.S
  16. 1 1
      libc/sysdeps/linux/sh/syscall_error.S
  17. 0 1
      libpthread/nptl/sysdeps/arm/dl-tls.h
  18. 0 1
      libpthread/nptl/sysdeps/arm/jmpbuf-unwind.h
  19. 0 1
      libpthread/nptl/sysdeps/arm/pthread_spin_lock.S
  20. 0 1
      libpthread/nptl/sysdeps/arm/pthread_spin_trylock.S
  21. 0 1
      libpthread/nptl/sysdeps/arm/pthreaddef.h
  22. 0 1
      libpthread/nptl/sysdeps/arm/sysdep.h
  23. 0 1
      libpthread/nptl/sysdeps/arm/tcb-offsets.sym
  24. 0 1
      libpthread/nptl/sysdeps/arm/tls.h
  25. 1 1
      libpthread/nptl/sysdeps/generic/dl-tls.c
  26. 0 1
      libpthread/nptl/sysdeps/mips/regdef.h
  27. 2 2
      libpthread/nptl/sysdeps/pthread/bits/libc-tsd.h
  28. 0 1
      libpthread/nptl/sysdeps/sparc/jmpbuf-unwind.h
  29. 0 1
      libpthread/nptl/sysdeps/sparc/pthreaddef.h
  30. 4 4
      libpthread/nptl/sysdeps/unix/sysv/linux/Makefile.in
  31. 0 1
      libpthread/nptl/sysdeps/unix/sysv/linux/arm/bits/atomic.h
  32. 0 1
      libpthread/nptl/sysdeps/unix/sysv/linux/arm/bits/pthreadtypes.h
  33. 0 1
      libpthread/nptl/sysdeps/unix/sysv/linux/arm/bits/semaphore.h
  34. 0 1
      libpthread/nptl/sysdeps/unix/sysv/linux/arm/createthread.c
  35. 0 1
      libpthread/nptl/sysdeps/unix/sysv/linux/arm/fork.c
  36. 0 1
      libpthread/nptl/sysdeps/unix/sysv/linux/arm/lowlevellock.c
  37. 0 1
      libpthread/nptl/sysdeps/unix/sysv/linux/arm/lowlevellock.h
  38. 0 1
      libpthread/nptl/sysdeps/unix/sysv/linux/arm/pt-vfork.S
  39. 0 1
      libpthread/nptl/sysdeps/unix/sysv/linux/arm/pthread_once.c
  40. 0 1
      libpthread/nptl/sysdeps/unix/sysv/linux/arm/sysdep-cancel.h
  41. 6 7
      libpthread/nptl/sysdeps/unix/sysv/linux/arm/sysdep.h
  42. 0 1
      libpthread/nptl/sysdeps/unix/sysv/linux/arm/unwind-forcedunwind.c
  43. 0 1
      libpthread/nptl/sysdeps/unix/sysv/linux/arm/unwind-resume.c
  44. 0 1
      libpthread/nptl/sysdeps/unix/sysv/linux/arm/unwind.h
  45. 0 1
      libpthread/nptl/sysdeps/unix/sysv/linux/arm/vfork.S
  46. 1 1
      libpthread/nptl/sysdeps/unix/sysv/linux/i386/Makefile.arch
  47. 0 1
      libpthread/nptl/sysdeps/unix/sysv/linux/i386/i486/pthread_cond_timedwait.S
  48. 0 1
      libpthread/nptl/sysdeps/unix/sysv/linux/i386/i486/pthread_cond_wait.S
  49. 1 1
      libpthread/nptl/sysdeps/unix/sysv/linux/i386/sysdep.h
  50. 1 1
      libpthread/nptl/sysdeps/unix/sysv/linux/sh/lowlevellock.S
  51. 0 1
      libpthread/nptl/sysdeps/unix/sysv/linux/sh/not-cancel.h
  52. 1 1
      libpthread/nptl/sysdeps/unix/sysv/linux/sh/pthread_barrier_wait.S
  53. 0 1
      libpthread/nptl/sysdeps/unix/sysv/linux/sh/pthread_cond_signal.S
  54. 8 8
      libpthread/nptl/sysdeps/unix/sysv/linux/sh/pthread_cond_timedwait.S
  55. 3 3
      libpthread/nptl/sysdeps/unix/sysv/linux/sh/pthread_cond_wait.S
  56. 3 3
      libpthread/nptl/sysdeps/unix/sysv/linux/sh/pthread_once.S
  57. 1 1
      libpthread/nptl/sysdeps/unix/sysv/linux/sh/pthread_rwlock_rdlock.S
  58. 1 1
      libpthread/nptl/sysdeps/unix/sysv/linux/sh/pthread_rwlock_unlock.S
  59. 1 1
      libpthread/nptl/sysdeps/unix/sysv/linux/sh/sem_timedwait.S
  60. 1 1
      libpthread/nptl/sysdeps/unix/sysv/linux/sh/sem_wait.S
  61. 2 2
      libpthread/nptl/sysdeps/unix/sysv/linux/x86_64/lowlevellock.h
  62. 1 1
      libpthread/nptl_db/td_ta_map_lwp2thr.c
  63. 1 1
      test/nptl/tst-umask1.c
  64. 1 1
      test/tls/tst-tls6.c

+ 35 - 35
libc/inet/socketcalls.c

@@ -33,7 +33,7 @@ extern int __socketcall(int call, unsigned long *args) attribute_hidden;
 #define SYS_RECVMSG     17
 #endif
 
-#ifdef __UCLIBC_HAS_THREADS_NATIVE__ 
+#ifdef __UCLIBC_HAS_THREADS_NATIVE__
 #include <sysdep-cancel.h>
 #include <pthreadP.h>
 #else
@@ -53,7 +53,7 @@ int __libc_accept(int s, struct sockaddr *addr, socklen_t * addrlen)
 	args[0] = s;
 	args[1] = (unsigned long) addr;
 	args[2] = (unsigned long) addrlen;
-	
+
 	if (SINGLE_THREAD_P)
 		return __socketcall(SYS_ACCEPT, args);
 
@@ -62,8 +62,8 @@ int __libc_accept(int s, struct sockaddr *addr, socklen_t * addrlen)
 	int result = __socketcall(SYS_ACCEPT, args);
 	LIBC_CANCEL_RESET (oldtype);
 	return result;
-#endif		
-		
+#endif
+
 }
 #endif
 weak_alias(__libc_accept,accept)
@@ -101,15 +101,15 @@ int __libc_connect(int sockfd, const struct sockaddr *saddr, socklen_t addrlen)
 	args[1] = (unsigned long) saddr;
 	args[2] = addrlen;
 
-if (SINGLE_THREAD_P)
-	return __socketcall(SYS_CONNECT, args);
-		
+	if (SINGLE_THREAD_P)
+		return __socketcall(SYS_CONNECT, args);
+
 #ifdef __UCLIBC_HAS_THREADS_NATIVE__
 	int oldtype = LIBC_CANCEL_ASYNC ();
 	int result = __socketcall(SYS_CONNECT, args);
 	LIBC_CANCEL_RESET (oldtype);
 	return result;
-#endif		
+#endif
 }
 #endif
 weak_alias(__libc_connect,connect)
@@ -200,16 +200,16 @@ ssize_t __libc_recv(int sockfd, __ptr_t buffer, size_t len, int flags)
 	args[1] = (unsigned long) buffer;
 	args[2] = len;
 	args[3] = flags;
-	
+
 	if (SINGLE_THREAD_P)
 		return (__socketcall(SYS_RECV, args));
-	
+
 #ifdef __UCLIBC_HAS_THREADS_NATIVE__
 	int oldtype = LIBC_CANCEL_ASYNC ();
 	int result = __socketcall(SYS_RECV, args);
 	LIBC_CANCEL_RESET (oldtype);
 	return result;
-#endif		
+#endif
 }
 #elif defined(__NR_recvfrom)
 ssize_t __libc_recv(int sockfd, __ptr_t buffer, size_t len, int flags)
@@ -241,15 +241,15 @@ ssize_t __libc_recvfrom(int sockfd, __ptr_t buffer, size_t len, int flags,
 	args[4] = (unsigned long) to;
 	args[5] = (unsigned long) tolen;
 
-if (SINGLE_THREAD_P)
-	return (__socketcall(SYS_RECVFROM, args));
-	
+	if (SINGLE_THREAD_P)
+		return (__socketcall(SYS_RECVFROM, args));
+
 #ifdef __UCLIBC_HAS_THREADS_NATIVE__
 	int oldtype = LIBC_CANCEL_ASYNC ();
 	int result = __socketcall(SYS_RECVFROM, args);
 	LIBC_CANCEL_RESET (oldtype);
 	return result;
-#endif		
+#endif
 }
 #endif
 weak_alias(__libc_recvfrom,recvfrom)
@@ -269,16 +269,16 @@ ssize_t __libc_recvmsg(int sockfd, struct msghdr *msg, int flags)
 	args[0] = sockfd;
 	args[1] = (unsigned long) msg;
 	args[2] = flags;
-	
-if (SINGLE_THREAD_P)
-	return (__socketcall(SYS_RECVMSG, args));	
-	
+
+	if (SINGLE_THREAD_P)
+		return (__socketcall(SYS_RECVMSG, args));
+
 #ifdef __UCLIBC_HAS_THREADS_NATIVE__
 	int oldtype = LIBC_CANCEL_ASYNC ();
 	int result = __socketcall(SYS_RECVMSG, args);
 	LIBC_CANCEL_RESET (oldtype);
 	return result;
-#endif		
+#endif
 }
 #endif
 weak_alias(__libc_recvmsg,recvmsg)
@@ -300,16 +300,16 @@ ssize_t __libc_send(int sockfd, const void *buffer, size_t len, int flags)
 	args[1] = (unsigned long) buffer;
 	args[2] = len;
 	args[3] = flags;
-	
-if (SINGLE_THREAD_P)
-	return (__socketcall(SYS_SEND, args));
-		
+
+	if (SINGLE_THREAD_P)
+		return (__socketcall(SYS_SEND, args));
+
 #ifdef __UCLIBC_HAS_THREADS_NATIVE__
 	int oldtype = LIBC_CANCEL_ASYNC ();
 	int result = __socketcall(SYS_SEND, args);
 	LIBC_CANCEL_RESET (oldtype);
 	return result;
-#endif		
+#endif
 }
 #elif defined(__NR_sendto)
 ssize_t __libc_send(int sockfd, const void *buffer, size_t len, int flags)
@@ -334,16 +334,16 @@ ssize_t __libc_sendmsg(int sockfd, const struct msghdr *msg, int flags)
 	args[0] = sockfd;
 	args[1] = (unsigned long) msg;
 	args[2] = flags;
-	
-if (SINGLE_THREAD_P)
-	return (__socketcall(SYS_SENDMSG, args));
-	
+
+	if (SINGLE_THREAD_P)
+		return (__socketcall(SYS_SENDMSG, args));
+
 #ifdef __UCLIBC_HAS_THREADS_NATIVE__
 	int oldtype = LIBC_CANCEL_ASYNC ();
 	int result = __socketcall(SYS_SENDMSG, args);
 	LIBC_CANCEL_RESET (oldtype);
 	return result;
-#endif		
+#endif
 }
 #endif
 weak_alias(__libc_sendmsg,sendmsg)
@@ -369,16 +369,16 @@ ssize_t __libc_sendto(int sockfd, const void *buffer, size_t len, int flags,
 	args[3] = flags;
 	args[4] = (unsigned long) to;
 	args[5] = tolen;
-	
-if (SINGLE_THREAD_P)
-	return (__socketcall(SYS_SENDTO, args));
-	
+
+	if (SINGLE_THREAD_P)
+		return (__socketcall(SYS_SENDTO, args));
+
 #ifdef __UCLIBC_HAS_THREADS_NATIVE__
 	int oldtype = LIBC_CANCEL_ASYNC ();
 	int result = __socketcall(SYS_SENDTO, args);
 	LIBC_CANCEL_RESET (oldtype);
 	return result;
-#endif		
+#endif
 }
 #endif
 weak_alias(__libc_sendto,sendto)

+ 1 - 1
libc/misc/internals/__uClibc_main.c

@@ -66,7 +66,7 @@ uintptr_t __guard attribute_relro;
 /*
  * Needed to initialize _dl_phdr when statically linked
  */
- 
+
 void internal_function _dl_aux_init (ElfW(auxv_t) *av);
 #endif /* !SHARED */
 

+ 0 - 1
libc/misc/pthread/tsd.c

@@ -8,4 +8,3 @@ __libc_dl_error_tsd (void)
   static __thread void *data __attribute__ ((tls_model ("initial-exec")));
   return &data;
 }
-

+ 1 - 1
libc/stdlib/system.c

@@ -80,7 +80,7 @@ int __libc_system(const char *command)
 
 libc_hidden_proto(sigaction)
 libc_hidden_proto(waitpid)
-      
+
 #if defined __ia64__
 # define FORK() \
   INLINE_SYSCALL (clone2, 6, CLONE_PARENT_SETTID | SIGCHLD, NULL, 0, \

+ 1 - 1
libc/sysdeps/linux/common/Makefile.in

@@ -33,7 +33,7 @@ CSRC := $(filter-out capget.c capset.c inotify.c ioperm.c iopl.c madvise.c \
 	splice.c vmsplice.c tee.c signalfd.c swapoff.c swapon.c \
 	sync_file_range.c sysctl.c sysinfo.c timerfd.c uselib.c vhangup.c,$(CSRC))
 endif
-	
+
 ifeq ($(UCLIBC_HAS_THREADS_NATIVE),y)
 CSRC := $(filter-out fork.c getpid.c raise.c open.c close.c read.c write.c, $(CSRC))
 ifneq ($(TARGET_ARCH),arm)

+ 0 - 1
libc/sysdeps/linux/common/__rt_sigwaitinfo.c

@@ -100,4 +100,3 @@ int attribute_hidden __sigwaitinfo(const sigset_t * set, siginfo_t * info)
 libc_hidden_proto(sigwaitinfo)
 weak_alias (__sigwaitinfo, sigwaitinfo)
 libc_hidden_weak(sigwaitinfo)
-

+ 2 - 2
libc/sysdeps/linux/common/__syscall_fcntl.c

@@ -17,11 +17,11 @@
 #include <bits/wordsize.h>
 
 extern __typeof(fcntl) __libc_fcntl;
-libc_hidden_proto(__libc_fcntl) 
+libc_hidden_proto(__libc_fcntl)
 
 #ifdef __UCLIBC_HAS_THREADS_NATIVE__
 int __fcntl_nocancel (int fd, int cmd, ...)
-{   
+{
 	va_list ap;
 	void *arg;
 

+ 1 - 1
libc/sysdeps/linux/common/nanosleep.c

@@ -10,7 +10,7 @@
 #include <sys/syscall.h>
 #include <time.h>
 
-#ifdef __UCLIBC_HAS_THREADS_NATIVE__ 
+#ifdef __UCLIBC_HAS_THREADS_NATIVE__
 #include <sysdep-cancel.h>
 #include <pthreadP.h>
 #else

+ 1 - 1
libc/sysdeps/linux/common/poll.c

@@ -24,7 +24,7 @@
 #include <sysdep-cancel.h>
 #else
 #define SINGLE_THREAD_P 1
-#endif 
+#endif
 
 libc_hidden_proto(poll)
 

+ 0 - 1
libc/sysdeps/linux/mips/clone.S

@@ -133,4 +133,3 @@ L(__thread_start):
 #endif
 	.end  __thread_start
 weak_alias(clone, __clone)
-

+ 3 - 3
libc/sysdeps/linux/mips/syscall_error.S

@@ -1,4 +1,4 @@
-/* Copyright (C) 1992, 1993, 1994, 1997, 1998, 1999, 2000, 2002, 2003 
+/* Copyright (C) 1992, 1993, 1994, 1997, 1998, 1999, 2000, 2002, 2003
    Free Software Foundation, Inc.
    This file is part of the GNU C Library.
    Contributed by Brendan Kehoe (brendan@zen.org).
@@ -29,7 +29,7 @@ FRAMESZ= (((NARGSAVE+LOCALSZ)*SZREG)+ALSZ)&ALMASK
 RAOFF= FRAMESZ-(1*SZREG)
 GPOFF= FRAMESZ-(2*SZREG)
 V0OFF= FRAMESZ-(3*SZREG)
-	
+
 ENTRY(__syscall_error)
 #ifdef __PIC__
 	.set noat
@@ -69,7 +69,7 @@ ENTRY(__syscall_error)
 	SETUP_GPX (AT)
 #endif
 	SETUP_GPX64 (t9, AT)
-	
+
 	/* Store it in errno... */
 	sw v0, errno
 

+ 1 - 1
libc/sysdeps/linux/sh/bits/atomic.h

@@ -260,7 +260,7 @@ typedef uintmax_t uatomic_max_t;
 
 #define __arch_bit_set_32_int(mem, value)		\
   __arch_operate_new_n(mem, 1<<(value), l, or)
-  
+
 #define __arch_bit_set_64_int(mem, value)		\
   (abort (), 0)
 

+ 3 - 3
libc/sysdeps/linux/sh/clone.S

@@ -59,7 +59,7 @@ ENTRY(__clone)
 	not	r1, r1			// r1=0 means r0 = -1 to -4095
 	tst	r1, r1			// i.e. error in linux
 	bf	.Lclone_end
-.Lsyscall_error:	
+.Lsyscall_error:
 	SYSCALL_ERROR_HANDLER
 .Lclone_end:
 	tst	r0, r0
@@ -87,10 +87,10 @@ ENTRY(__clone)
 	stc	gbr, r1
 	mov.w	.Lpidoff, r2
 	add	r1, r2
-	mov.l	r0, @r2	
+	mov.l	r0, @r2
 	mov.w	.Ltidoff, r2
 	add	r1, r2
-	mov.l	r0, @r2	
+	mov.l	r0, @r2
 4:
 #endif
 	/* thread starts */

+ 6 - 6
libc/sysdeps/linux/sh/pread_write.c

@@ -39,7 +39,7 @@ static __inline__ _syscall6(ssize_t, __syscall_pread, int, fd, void *, buf,
 		size_t, count, int, dummy, off_t, offset_hi, off_t, offset_lo)
 
 ssize_t __libc_pread(int fd, void *buf, size_t count, off_t offset)
-{ 
+{
 	if (SINGLE_THREAD_P)
 		return(__syscall_pread(fd,buf,count,0,__LONG_LONG_PAIR(offset >> 31,offset)));
 
@@ -48,14 +48,14 @@ ssize_t __libc_pread(int fd, void *buf, size_t count, off_t offset)
 	ssize_t result = __syscall_pread(fd,buf,count,0,__LONG_LONG_PAIR(offset >> 31,offset));
 	LIBC_CANCEL_RESET (oldtype);
 	return result;
-#endif	
+#endif
 }
 weak_alias(__libc_pread,pread)
 
 # ifdef __UCLIBC_HAS_LFS__
 extern __typeof(pread64) __libc_pread64;
 ssize_t __libc_pread64(int fd, void *buf, size_t count, off64_t offset)
-{ 
+{
 	uint32_t low = offset & 0xffffffff;
 	uint32_t high = offset >> 32;
 
@@ -67,7 +67,7 @@ ssize_t __libc_pread64(int fd, void *buf, size_t count, off64_t offset)
 	ssize_t result = __syscall_pread(fd, buf, count, 0, __LONG_LONG_PAIR (high, low));
 	LIBC_CANCEL_RESET (oldtype);
 	return result;
-#endif	
+#endif
 }
 weak_alias(__libc_pread64,pread64)
 # endif /* __UCLIBC_HAS_LFS__  */
@@ -89,7 +89,7 @@ static __inline__ _syscall6(ssize_t, __syscall_pwrite, int, fd, const void *, bu
 		size_t, count, int, dummy, off_t, offset_hi, off_t, offset_lo)
 
 ssize_t __libc_pwrite(int fd, const void *buf, size_t count, off_t offset)
-{ 
+{
 	if (SINGLE_THREAD_P)
 		return __syscall_pwrite(fd,buf,count,0,__LONG_LONG_PAIR(offset >> 31,offset));
 
@@ -106,7 +106,7 @@ weak_alias(__libc_pwrite,pwrite)
 # ifdef __UCLIBC_HAS_LFS__
 extern __typeof(pwrite64) __libc_pwrite64;
 ssize_t __libc_pwrite64(int fd, const void *buf, size_t count, off64_t offset)
-{ 
+{
 	uint32_t low = offset & 0xffffffff;
 	uint32_t high = offset >> 32;
 

+ 1 - 1
libc/sysdeps/linux/sh/setjmp.S

@@ -77,7 +77,7 @@ __sigsetjmp_intern:
 	mov.l	r9, @-r4
 	mov.l	r8, @-r4
 
-#ifdef __HAVE_SHARED__ 
+#ifdef __HAVE_SHARED__
 	mov.l	.LG, r2
 	mova	.LG, r0
 	add	r0, r2

+ 1 - 1
libc/sysdeps/linux/sh/syscall_error.S

@@ -3,7 +3,7 @@ __syscall_error:
 	/* Call errno_location, store '-r4' in errno and return -1 */
 	mov.l	r12, @-r15
 	sts.l	pr, @-r15
-#ifdef SHARED 
+#ifdef SHARED
 	mova	.LG, r0
 	mov.l	.LG, r12
 	add	r0, r12

+ 0 - 1
libpthread/nptl/sysdeps/arm/dl-tls.h

@@ -27,4 +27,3 @@ typedef struct
 
 
 extern void *__tls_get_addr (tls_index *ti);
-

+ 0 - 1
libpthread/nptl/sysdeps/arm/jmpbuf-unwind.h

@@ -34,4 +34,3 @@
 
 /* We use the normal longjmp for unwinding.  */
 #define __libc_unwind_longjmp(buf, val) longjmp (buf, val)
-

+ 0 - 1
libpthread/nptl/sysdeps/arm/pthread_spin_lock.S

@@ -29,4 +29,3 @@ ENTRY (pthread_spin_lock)
 	mov	r0, #0
 	PSEUDO_RET_NOERRNO
 END (pthread_spin_lock)
-

+ 0 - 1
libpthread/nptl/sysdeps/arm/pthread_spin_trylock.S

@@ -32,4 +32,3 @@ ENTRY (pthread_spin_trylock)
 	movne	r0, #EBUSY
 	PSEUDO_RET_NOERRNO
 END (pthread_spin_trylock)
-

+ 0 - 1
libpthread/nptl/sysdeps/arm/pthreaddef.h

@@ -37,4 +37,3 @@
 /* XXX Until we have a better place keep the definitions here.  */
 #define __exit_thread_inline(val) \
   INLINE_SYSCALL (exit, 1, (val))
-

+ 0 - 1
libpthread/nptl/sysdeps/arm/sysdep.h

@@ -89,4 +89,3 @@
 #endif
 
 #endif	/* __ASSEMBLER__ */
-

+ 0 - 1
libpthread/nptl/sysdeps/arm/tcb-offsets.sym

@@ -9,4 +9,3 @@
 MULTIPLE_THREADS_OFFSET		thread_offsetof (header.multiple_threads)
 PID_OFFSET			thread_offsetof (pid)
 TID_OFFSET			thread_offsetof (tid)
-

+ 0 - 1
libpthread/nptl/sysdeps/arm/tls.h

@@ -138,4 +138,3 @@ typedef struct
 #endif /* __ASSEMBLER__ */
 
 #endif	/* tls.h */
-

+ 1 - 1
libpthread/nptl/sysdeps/generic/dl-tls.c

@@ -80,7 +80,7 @@ void *_dl_memalign(size_t alignment, size_t bytes)
  * not be inlined as much as possible.
  */
 
- 
+
 void
 internal_function __attribute_noinline__
 _dl_allocate_static_tls (struct link_map *map)

+ 0 - 1
libpthread/nptl/sysdeps/mips/regdef.h

@@ -24,4 +24,3 @@
 #include <sys/fpregdef.h>
 
 #endif /* _REGDEF_H */
-

+ 2 - 2
libpthread/nptl/sysdeps/pthread/bits/libc-tsd.h

@@ -24,12 +24,12 @@
    set of thread-specific `void *' data used only internally by libc.
 
    __libc_tsd_define(CLASS, KEY)	-- Define or declare a `void *' datum
-   					   for KEY.  CLASS can be `static' for
+                       for KEY.  CLASS can be `static' for
 					   keys used in only one source file,
 					   empty for global definitions, or
 					   `extern' for global declarations.
    __libc_tsd_address(KEY)		-- Return the `void **' pointing to
-   					   the current thread's datum for KEY.
+                       the current thread's datum for KEY.
    __libc_tsd_get(KEY)			-- Return the `void *' datum for KEY.
    __libc_tsd_set(KEY, VALUE)		-- Set the datum for KEY to VALUE.
 

+ 0 - 1
libpthread/nptl/sysdeps/sparc/jmpbuf-unwind.h

@@ -3,4 +3,3 @@
 #else
 #include "sparc32/jmpbuf-unwind.h"
 #endif
-

+ 0 - 1
libpthread/nptl/sysdeps/sparc/pthreaddef.h

@@ -3,4 +3,3 @@
 #else
 #include "sparc32/pthreaddef.h"
 #endif
-

+ 4 - 4
libpthread/nptl/sysdeps/unix/sysv/linux/Makefile.in

@@ -19,7 +19,7 @@ libc_CSRC = libc_pthread_init.c libc_multiple_threads.c			\
 	    register-atfork.c unregister-atfork.c getpid.c		\
 	    raise.c sleep.c jmp-unwind.c
 
-# These provide both a cancellable and a not cancellable implementation 
+# These provide both a cancellable and a not cancellable implementation
 libc_SSRC = close.S open.S write.S read.S
 
 ifneq ($(TARGET_ARCH),arm)
@@ -45,7 +45,7 @@ endif
 ifeq ($(TARGET_ARCH),powerpc)
 libpthread_CSRC += lowlevellock.c
 libc_CSRC += libc-lowlevellock.c
-librt_CSRC := mq_notify.c 
+librt_CSRC := mq_notify.c
 endif
 
 ifeq ($(TARGET_ARCH),sparc)
@@ -65,7 +65,7 @@ endif
 
 
 ifeq ($(TARGET_ARCH),x86_64)
-librt_CSRC := mq_notify.c 
+librt_CSRC := mq_notify.c
 endif
 
 CFLAGS-pthread_getcpuclockid.c = -I$(top_srcdir)librt
@@ -195,7 +195,7 @@ ALL_HEADERS_BITS_PTHREAD := $(addprefix include/bits/,$(HEADERS_BITS_PTHREAD))
 
 $(ALL_HEADERS_BITS_PTHREAD):
 	$(do_ln) ../../$(PTHREAD_LINUX_DIR)/bits/$(@F) $(top_builddir)$@
-	
+
 nptl_linux_headers_clean:
 	$(do_rm) $(addprefix $(PTHREAD_LINUX_OUT)/lowlevelbarrier., c h s) \
 	$(addprefix $(PTHREAD_LINUX_OUT)/lowlevelcond., c h s) \

+ 0 - 1
libpthread/nptl/sysdeps/unix/sysv/linux/arm/bits/atomic.h

@@ -134,4 +134,3 @@ unsigned int __thumb_cmpxchg (unsigned int oldval, unsigned int newval, void *me
   ({ __arm_link_error (); oldval; })
 
 #endif /* __thumb__ */
-

+ 0 - 1
libpthread/nptl/sysdeps/unix/sysv/linux/arm/bits/pthreadtypes.h

@@ -165,4 +165,3 @@ typedef union
 
 
 #endif	/* bits/pthreadtypes.h */
-

+ 0 - 1
libpthread/nptl/sysdeps/unix/sysv/linux/arm/bits/semaphore.h

@@ -36,4 +36,3 @@ typedef union
   char __size[__SIZEOF_SEM_T];
   long int __align;
 } sem_t;
-

+ 0 - 1
libpthread/nptl/sysdeps/unix/sysv/linux/arm/createthread.c

@@ -21,4 +21,3 @@
 
 /* Get the real implementation.	 */
 #include <sysdeps/pthread/createthread.c>
-

+ 0 - 1
libpthread/nptl/sysdeps/unix/sysv/linux/arm/fork.c

@@ -29,4 +29,3 @@
 		  NULL, NULL, NULL, &THREAD_SELF->tid)
 
 #include "../fork.c"
-

+ 0 - 1
libpthread/nptl/sysdeps/unix/sysv/linux/arm/lowlevellock.c

@@ -116,4 +116,3 @@ __lll_timedwait_tid (int *tidp, const struct timespec *abstime)
 }
 
 #endif
-

+ 0 - 1
libpthread/nptl/sysdeps/unix/sysv/linux/arm/lowlevellock.h

@@ -337,4 +337,3 @@ extern void __lll_cond_broadcast (pthread_cond_t *cond)
   __lll_cond_broadcast (cond)
 
 #endif	/* lowlevellock.h */
-

+ 0 - 1
libpthread/nptl/sysdeps/unix/sysv/linux/arm/pt-vfork.S

@@ -36,4 +36,3 @@
 	strne	r3, [r2, #PID_OFFSET]	/* ... restore the saved PID.  */
 
 #INCLUDE <../../../../../../../LIBC/SYSDEPS/LINUX/ARM/VFORK.S>
-

+ 0 - 1
libpthread/nptl/sysdeps/unix/sysv/linux/arm/pthread_once.c

@@ -97,4 +97,3 @@ const void *include_pthread_getspecific attribute_hidden = pthread_getspecific;
 const void *include_pthread_setspecific attribute_hidden = pthread_setspecific;
 const void *include_pthread_key_create attribute_hidden = pthread_key_create;
 #endif
-

+ 0 - 1
libpthread/nptl/sysdeps/unix/sysv/linux/arm/sysdep-cancel.h

@@ -151,4 +151,3 @@ extern int __local_multiple_threads attribute_hidden;
 # define NO_CANCELLATION 1
 
 #endif
-

+ 6 - 7
libpthread/nptl/sysdeps/unix/sysv/linux/arm/sysdep.h

@@ -137,12 +137,12 @@ __local_syscall_error:						\
 
    The compiler is going to form a call by coming here, through PSEUDO, with
    arguments
-   	syscall number	in the DO_CALL macro
-   	arg 1		r0
-   	arg 2		r1
-   	arg 3		r2
-   	arg 4		r3
-   	arg 5		[sp]
+	syscall number	in the DO_CALL macro
+	arg 1		r0
+	arg 2		r1
+	arg 3		r2
+	arg 4		r3
+	arg 5		[sp]
 	arg 6		[sp+4]
 	arg 7		[sp+8]
 
@@ -332,4 +332,3 @@ __local_syscall_error:						\
 #endif	/* __ASSEMBLER__ */
 
 #endif /* linux/arm/sysdep.h */
-

+ 0 - 1
libpthread/nptl/sysdeps/unix/sysv/linux/arm/unwind-forcedunwind.c

@@ -127,4 +127,3 @@ _Unwind_GetCFA (struct _Unwind_Context *context)
     pthread_cancel_init ();
   return libgcc_s_getcfa (context);
 }
-

+ 0 - 1
libpthread/nptl/sysdeps/unix/sysv/linux/arm/unwind-resume.c

@@ -93,4 +93,3 @@ __gcc_personality_v0 (_Unwind_State state,
     init ();
   return libgcc_s_personality (state, ue_header, context);
 }
-

+ 0 - 1
libpthread/nptl/sysdeps/unix/sysv/linux/arm/unwind.h

@@ -272,4 +272,3 @@ extern "C" {
 #endif
 
 #endif /* defined UNWIND_ARM_H */
-

+ 0 - 1
libpthread/nptl/sysdeps/unix/sysv/linux/arm/vfork.S

@@ -37,4 +37,3 @@
 	strne	r3, [r2, #PID_OFFSET]	/* ... restore the saved PID.  */
 
 #include "../../../../../../../libc/sysdeps/linux/arm/vfork.S"
-

+ 1 - 1
libpthread/nptl/sysdeps/unix/sysv/linux/i386/Makefile.arch

@@ -8,7 +8,7 @@ LINUX_ARCH_DIR:=$(top_srcdir)libpthread/nptl/sysdeps/unix/sysv/linux/i386
 LINUX_ARCH_OUT:=$(top_builddir)libpthread/nptl/sysdeps/unix/sysv/linux/i386
 
 
-libpthread_SSRC = pt-vfork.S clone.S pthread_spin_unlock.S pthread_once.S 
+libpthread_SSRC = pt-vfork.S clone.S pthread_spin_unlock.S pthread_once.S
 libpthread_CSRC = pthread_spin_init.c pt-__syscall_error.c
 
 libc_a_CSRC = fork.c

+ 0 - 1
libpthread/nptl/sysdeps/unix/sysv/linux/i386/i486/pthread_cond_timedwait.S

@@ -463,4 +463,3 @@ __condvar_tw_cleanup:
 	hlt
 .LENDCODE:
 	.size	__condvar_tw_cleanup, .-__condvar_tw_cleanup
-

+ 0 - 1
libpthread/nptl/sysdeps/unix/sysv/linux/i386/i486/pthread_cond_wait.S

@@ -355,4 +355,3 @@ __condvar_w_cleanup:
 	hlt
 .LENDCODE:
 	.size	__condvar_w_cleanup, .-__condvar_w_cleanup
-

+ 1 - 1
libpthread/nptl/sysdeps/unix/sysv/linux/i386/sysdep.h

@@ -1,5 +1,5 @@
 /* Copyright (C) 1992,1993,1995-2000,2002-2006,2007
-   	Free Software Foundation, Inc.
+	Free Software Foundation, Inc.
    This file is part of the GNU C Library.
    Contributed by Ulrich Drepper, <drepper@gnu.org>, August 1995.
 

+ 1 - 1
libpthread/nptl/sysdeps/unix/sysv/linux/sh/lowlevellock.S

@@ -185,7 +185,7 @@ lll_unlock_wake_cb:
 	trapa	#0x14
 	SYSCALL_INST_PAD
 
-1:	
+1:
 	rts
 	nop
 	.size	lll_unlock_wake_cb,.-lll_unlock_wake_cb

+ 0 - 1
libpthread/nptl/sysdeps/unix/sysv/linux/sh/not-cancel.h

@@ -80,4 +80,3 @@ libc_hidden_proto(__waitpid_nocancel)
 # define waitpid_not_cancel(pid, stat_loc, options) \
   INLINE_SYSCALL (wait4, 4, pid, stat_loc, options, NULL)
 #endif
-

+ 1 - 1
libpthread/nptl/sysdeps/unix/sysv/linux/sh/pthread_barrier_wait.S

@@ -167,7 +167,7 @@ pthread_barrier_wait:
 	bra	7b
 	 mov	r9, r6
 
-9:	
+9:
 	mov	r6, r9
 	mov	r8, r4
 	mov.l	.Lwake2, r1

+ 0 - 1
libpthread/nptl/sysdeps/unix/sysv/linux/sh/pthread_cond_signal.S

@@ -133,4 +133,3 @@ __pthread_cond_signal:
 	.long	__lll_mutex_unlock_wake-.Lmwake4b
 	.size	__pthread_cond_signal, .-__pthread_cond_signal
 weak_alias (__pthread_cond_signal, pthread_cond_signal)
-

+ 8 - 8
libpthread/nptl/sysdeps/unix/sysv/linux/sh/pthread_cond_timedwait.S

@@ -93,7 +93,7 @@ __pthread_cond_timedwait:
 	bt	17f
 	mov.l	r9, @(dep_mutex,r8)
 
-17:	
+17:
 	/* Unlock the mutex.  */
 	mov.l	.Lmunlock1, r1
 	mov	#0, r5
@@ -123,14 +123,14 @@ __pthread_cond_timedwait:
 	mov.l	@(cond_nwaiters,r8), r0
 	add	r2, r0
 	mov.l	r0, @(cond_nwaiters,r8)
-	
+
 	/* Get and store current wakeup_seq value.  */
 	mov.l	@(wakeup_seq,r8), r10
 	mov.l	@(wakeup_seq+4,r8), r11
 	mov.l	@(broadcast_seq,r8), r0
 	mov.l	r0, @(4,r15)
 
-8:	
+8:
 	/* Get current time.  */
 #ifdef __NR_clock_gettime
 	/* Get the clock number.	 */
@@ -159,7 +159,7 @@ __pthread_cond_timedwait:
 	.word	__NR_clock_gettime
 
 # ifndef __ASSUME_POSIX_TIMERS
-19:	
+19:
 	mov	r15, r4
 	add	#16, r4
 	mov	#0, r5
@@ -176,7 +176,7 @@ __pthread_cond_timedwait:
 	mov.l	@(16,r15), r0
 	sts	macl, r1
 #endif
-0:	
+0:
 #else
 	mov	r15, r4
 	add	#16, r4
@@ -349,8 +349,8 @@ __pthread_cond_timedwait:
 	extu.b	r3, r3
 	trapa	#0x14
 	SYSCALL_INST_PAD
-	
-25:	
+
+25:
 #if cond_lock != 0
 	DEC (@(cond_lock,r8), r2)
 #else
@@ -371,7 +371,7 @@ __pthread_cond_timedwait:
 	bf	18f
 	mov.l	@(24,r15), r0
 
-18:	
+18:
 	add	#64, r15
 	lds.l	@r15+, pr
 	mov.l	@r15+, r13

+ 3 - 3
libpthread/nptl/sysdeps/unix/sysv/linux/sh/pthread_cond_wait.S

@@ -71,7 +71,7 @@ __pthread_cond_wait:
 	.long	_GLOBAL_OFFSET_TABLE_
 #endif
 
-2:	
+2:
 	/* Store the reference to the mutex.  If there is already a
 	   different value in there this is a bad user bug.  */
 	mov.l	@(dep_mutex,r8),r0
@@ -79,7 +79,7 @@ __pthread_cond_wait:
 	bt	15f
 	mov.l	r9, @(dep_mutex,r8)
 
-15:	
+15:
 	/* Unlock the mutex.  */
 	mov.l	.Lmunlock0, r1
 	mov	#0, r5
@@ -149,7 +149,7 @@ __pthread_cond_wait:
 	mov.l	.Ldisable0, r1
 	bsrf	r1
 	 mov.l	@r15, r4
-.Ldisable0b:	
+.Ldisable0b:
 .LcleanupEND:
 
 	/* Lock.  */

+ 3 - 3
libpthread/nptl/sysdeps/unix/sysv/linux/sh/pthread_once.S

@@ -73,7 +73,7 @@ __pthread_once:
 	add	r12, r2
 #endif
 	mov.l	@r2, r3
-	or	r3, r0	
+	or	r3, r0
 	or	#1, r0
 	mov	r0, r3
 	mov	r1, r5
@@ -108,10 +108,10 @@ __pthread_once:
 .Lgot:
 	.long	_GLOBAL_OFFSET_TABLE_
 #ifdef PIC
-.Lfgen:	
+.Lfgen:
 	.long	__fork_generation@GOTOFF
 #else
-.Lfgen:	
+.Lfgen:
 	.long	__fork_generation
 #endif
 

+ 1 - 1
libpthread/nptl/sysdeps/unix/sysv/linux/sh/pthread_rwlock_rdlock.S

@@ -148,7 +148,7 @@ __pthread_rwlock_rdlock:
 
 .Ltidoff:
 	.word	TID - TLS_PRE_TCB_SIZE
-	
+
 6:
 	mov	r8, r4
 #if MUTEX != 0

+ 1 - 1
libpthread/nptl/sysdeps/unix/sysv/linux/sh/pthread_rwlock_unlock.S

@@ -154,7 +154,7 @@ __pthread_rwlock_unlock:
 	 mov.l	@r15+, r4
 
 	.align	2
-.Lwait8:	
+.Lwait8:
 	.long	__lll_mutex_lock_wait-.Lwait8b
 .Lwake8:
 	.long	__lll_mutex_unlock_wake-.Lwake8b

+ 1 - 1
libpthread/nptl/sysdeps/unix/sysv/linux/sh/sem_timedwait.S

@@ -136,7 +136,7 @@ sem_timedwait:
 	mov	r10, r4
 	bsrf	r1
 	 mov	r0, r10
-.Ldisable0b:	
+.Ldisable0b:
 	mov	r10, r0
 
 	tst	r0, r0

+ 1 - 1
libpthread/nptl/sysdeps/unix/sysv/linux/sh/sem_wait.S

@@ -89,7 +89,7 @@ __new_sem_wait:
 	mov	r10, r4
 	bsrf	r1
 	 mov	r0, r10
-.Ldisable0b:	
+.Ldisable0b:
 	mov	r10, r0
 
 	tst	r0, r0

+ 2 - 2
libpthread/nptl/sysdeps/unix/sysv/linux/x86_64/lowlevellock.h

@@ -237,7 +237,7 @@ extern int lll_unlock_wake_cb (int *__futex) attribute_hidden;
 			      "je 0f\n\t"				      \
 			      "lock; cmpxchgl %0, %2\n\t"		      \
 			      "jnz 1f\n\t"				      \
-		  	      "jmp 2f\n"				      \
+			      "jmp 2f\n"				      \
 			      "0:\tcmpxchgl %0, %2\n\t"			      \
 			      "jnz 1f\n\t"				      \
 			      ".subsection 1\n"				      \
@@ -260,7 +260,7 @@ extern int lll_unlock_wake_cb (int *__futex) attribute_hidden;
 			      "je 0f\n\t"				      \
 			      "lock; decl %0\n\t"			      \
 			      "jne 1f\n\t"				      \
-		  	      "jmp 2f\n"				      \
+			      "jmp 2f\n"				      \
 			      "0:\tdecl %0\n\t"				      \
 			      "jne 1f\n\t"				      \
 			      ".subsection 1\n"				      \

+ 1 - 1
libpthread/nptl_db/td_ta_map_lwp2thr.c

@@ -49,7 +49,7 @@ td_ta_map_lwp2thr (const td_thragent_t *ta_arg,
 	{
 	  err = ps_pdread (ta->ph, howto,
 			   &ta->ta_howto_data.const_thread_area,
- 			   sizeof ta->ta_howto_data.const_thread_area);
+			   sizeof ta->ta_howto_data.const_thread_area);
 	  if (err != PS_OK)
 	    return TD_ERR;
 	  ta->ta_howto = ta_howto_const_thread_area;

+ 1 - 1
test/nptl/tst-umask1.c

@@ -66,7 +66,7 @@ work (const char *fname, int mask)
       if ((st.st_mode & mask) != 0)
 	{
 	  printf ("mask not successful after %s: %x still set\n",
-	      	  fcts[i].name, (unsigned int) (st.st_mode & mask));
+	      fcts[i].name, (unsigned int) (st.st_mode & mask));
 	  result = 1;
 	}
     }

+ 1 - 1
test/tls/tst-tls6.c

@@ -48,7 +48,7 @@ do_test (void)
 		  modid);
 	  result = 1;
 	}
-#else 
+#else
       if (modid == -1)
 	modid = ((struct link_map *) h)->l_tls_modid;
       else if (((struct link_map *) h)->l_tls_modid != modid)