diff options
Diffstat (limited to 'libc')
| -rw-r--r-- | libc/inet/socketcalls.c | 70 | ||||
| -rw-r--r-- | libc/misc/internals/__uClibc_main.c | 2 | ||||
| -rw-r--r-- | libc/misc/pthread/tsd.c | 1 | ||||
| -rw-r--r-- | libc/stdlib/system.c | 2 | ||||
| -rw-r--r-- | libc/sysdeps/linux/common/Makefile.in | 2 | ||||
| -rw-r--r-- | libc/sysdeps/linux/common/__rt_sigwaitinfo.c | 1 | ||||
| -rw-r--r-- | libc/sysdeps/linux/common/__syscall_fcntl.c | 4 | ||||
| -rw-r--r-- | libc/sysdeps/linux/common/nanosleep.c | 2 | ||||
| -rw-r--r-- | libc/sysdeps/linux/common/poll.c | 2 | ||||
| -rw-r--r-- | libc/sysdeps/linux/mips/clone.S | 1 | ||||
| -rw-r--r-- | libc/sysdeps/linux/mips/syscall_error.S | 6 | ||||
| -rw-r--r-- | libc/sysdeps/linux/sh/bits/atomic.h | 2 | ||||
| -rw-r--r-- | libc/sysdeps/linux/sh/clone.S | 6 | ||||
| -rw-r--r-- | libc/sysdeps/linux/sh/pread_write.c | 12 | ||||
| -rw-r--r-- | libc/sysdeps/linux/sh/setjmp.S | 2 | ||||
| -rw-r--r-- | libc/sysdeps/linux/sh/syscall_error.S | 2 | 
16 files changed, 57 insertions, 60 deletions
diff --git a/libc/inet/socketcalls.c b/libc/inet/socketcalls.c index 66dff4a30..e4bdbcb59 100644 --- a/libc/inet/socketcalls.c +++ b/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) diff --git a/libc/misc/internals/__uClibc_main.c b/libc/misc/internals/__uClibc_main.c index be63fe4cd..85dbe7123 100644 --- a/libc/misc/internals/__uClibc_main.c +++ b/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 */ diff --git a/libc/misc/pthread/tsd.c b/libc/misc/pthread/tsd.c index 434938d97..835ee22ce 100644 --- a/libc/misc/pthread/tsd.c +++ b/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;  } - diff --git a/libc/stdlib/system.c b/libc/stdlib/system.c index aa1f83676..7026a8d20 100644 --- a/libc/stdlib/system.c +++ b/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, \ diff --git a/libc/sysdeps/linux/common/Makefile.in b/libc/sysdeps/linux/common/Makefile.in index 535a57369..64c2432f5 100644 --- a/libc/sysdeps/linux/common/Makefile.in +++ b/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) diff --git a/libc/sysdeps/linux/common/__rt_sigwaitinfo.c b/libc/sysdeps/linux/common/__rt_sigwaitinfo.c index 1adc0fd73..c8953bfbc 100644 --- a/libc/sysdeps/linux/common/__rt_sigwaitinfo.c +++ b/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) - diff --git a/libc/sysdeps/linux/common/__syscall_fcntl.c b/libc/sysdeps/linux/common/__syscall_fcntl.c index 6a966d7df..4e3bc23df 100644 --- a/libc/sysdeps/linux/common/__syscall_fcntl.c +++ b/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; diff --git a/libc/sysdeps/linux/common/nanosleep.c b/libc/sysdeps/linux/common/nanosleep.c index 7e3349117..0be59c511 100644 --- a/libc/sysdeps/linux/common/nanosleep.c +++ b/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 diff --git a/libc/sysdeps/linux/common/poll.c b/libc/sysdeps/linux/common/poll.c index 425da3c8a..f50e92c8e 100644 --- a/libc/sysdeps/linux/common/poll.c +++ b/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) diff --git a/libc/sysdeps/linux/mips/clone.S b/libc/sysdeps/linux/mips/clone.S index 52b81cb1e..a53d5c492 100644 --- a/libc/sysdeps/linux/mips/clone.S +++ b/libc/sysdeps/linux/mips/clone.S @@ -133,4 +133,3 @@ L(__thread_start):  #endif  	.end  __thread_start  weak_alias(clone, __clone) - diff --git a/libc/sysdeps/linux/mips/syscall_error.S b/libc/sysdeps/linux/mips/syscall_error.S index c96b6ed12..1e348ad4a 100644 --- a/libc/sysdeps/linux/mips/syscall_error.S +++ b/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 diff --git a/libc/sysdeps/linux/sh/bits/atomic.h b/libc/sysdeps/linux/sh/bits/atomic.h index dd6e5f97d..a099b43a8 100644 --- a/libc/sysdeps/linux/sh/bits/atomic.h +++ b/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) diff --git a/libc/sysdeps/linux/sh/clone.S b/libc/sysdeps/linux/sh/clone.S index bb566276a..423a6c2f1 100644 --- a/libc/sysdeps/linux/sh/clone.S +++ b/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 */ diff --git a/libc/sysdeps/linux/sh/pread_write.c b/libc/sysdeps/linux/sh/pread_write.c index 76c750ad6..86feb9cce 100644 --- a/libc/sysdeps/linux/sh/pread_write.c +++ b/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; diff --git a/libc/sysdeps/linux/sh/setjmp.S b/libc/sysdeps/linux/sh/setjmp.S index 3296c2ba9..0a81424e1 100644 --- a/libc/sysdeps/linux/sh/setjmp.S +++ b/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 diff --git a/libc/sysdeps/linux/sh/syscall_error.S b/libc/sysdeps/linux/sh/syscall_error.S index d943dcbb0..737950308 100644 --- a/libc/sysdeps/linux/sh/syscall_error.S +++ b/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  | 
