diff options
| -rw-r--r-- | ldso/ldso/arm/dl-startup.h | 4 | ||||
| -rw-r--r-- | libc/sysdeps/linux/common/ioctl.c | 4 | ||||
| -rw-r--r-- | libc/sysdeps/linux/common/msync.c | 14 | ||||
| -rw-r--r-- | libc/sysdeps/linux/common/readv.c | 2 | ||||
| -rw-r--r-- | libc/sysdeps/linux/common/sigprocmask.c | 8 | ||||
| -rw-r--r-- | libc/sysdeps/linux/common/waitid.c | 2 | ||||
| -rw-r--r-- | libc/sysdeps/linux/common/writev.c | 4 |
7 files changed, 21 insertions, 17 deletions
diff --git a/ldso/ldso/arm/dl-startup.h b/ldso/ldso/arm/dl-startup.h index 43985d002..73edbffa7 100644 --- a/ldso/ldso/arm/dl-startup.h +++ b/ldso/ldso/arm/dl-startup.h @@ -136,7 +136,7 @@ __asm__( #define GET_ARGV(ARGVP, ARGS) ARGVP = (((unsigned long*)ARGS)+1) /* Handle relocation of the symbols in the dynamic loader. */ -static inline +static __always_inline void PERFORM_BOOTSTRAP_RELOC(ELF_RELOC *rpnt, unsigned long *reloc_addr, unsigned long symbol_addr, unsigned long load_addr, Elf32_Sym *symtab) { @@ -159,7 +159,7 @@ void PERFORM_BOOTSTRAP_RELOC(ELF_RELOC *rpnt, unsigned long *reloc_addr, if (topbits != 0xfe000000 && topbits != 0x00000000) { #if 0 - // Don't bother with this during ldso initilization... + /* Don't bother with this during ldso initilization... */ newvalue = fix_bad_pc24(reloc_addr, symbol_addr) - (unsigned long)reloc_addr + (addend << 2); topbits = newvalue & 0xfe000000; diff --git a/libc/sysdeps/linux/common/ioctl.c b/libc/sysdeps/linux/common/ioctl.c index f27fb05e3..f2f0f539a 100644 --- a/libc/sysdeps/linux/common/ioctl.c +++ b/libc/sysdeps/linux/common/ioctl.c @@ -20,8 +20,8 @@ libc_hidden_proto(ioctl) #define __NR___syscall_ioctl __NR_ioctl -static inline -_syscall3(int, __syscall_ioctl, int, fd, unsigned long int, request, void *, arg); +static __always_inline +_syscall3(int, __syscall_ioctl, int, fd, unsigned long int, request, void *, arg) int ioctl(int fd, unsigned long int request, ...) { diff --git a/libc/sysdeps/linux/common/msync.c b/libc/sysdeps/linux/common/msync.c index 5d8bf73fd..2629bd4aa 100644 --- a/libc/sysdeps/linux/common/msync.c +++ b/libc/sysdeps/linux/common/msync.c @@ -18,18 +18,22 @@ #endif #define __NR___syscall_msync __NR_msync -static inline _syscall3(int, __syscall_msync, void *, addr, size_t, length, - int, flags); +static __always_inline _syscall3(int, __syscall_msync, void *, addr, size_t, length, + int, flags) extern __typeof(msync) __libc_msync; int __libc_msync(void * addr, size_t length, int flags) { +#ifdef __UCLIBC_HAS_THREADS_NATIVE__ + int oldtype, result; +#endif + if (SINGLE_THREAD_P) - return __syscall_msync(addr, length, flags); + return __syscall_msync(addr, length, flags); #ifdef __UCLIBC_HAS_THREADS_NATIVE__ - int oldtype = LIBC_CANCEL_ASYNC (); - int result = __syscall_msync(addr, length, flags); + oldtype = LIBC_CANCEL_ASYNC (); + result = __syscall_msync(addr, length, flags); LIBC_CANCEL_RESET (oldtype); return result; #endif diff --git a/libc/sysdeps/linux/common/readv.c b/libc/sysdeps/linux/common/readv.c index 20c87084d..fce396d5f 100644 --- a/libc/sysdeps/linux/common/readv.c +++ b/libc/sysdeps/linux/common/readv.c @@ -46,5 +46,5 @@ ssize_t readv (int fd, const struct iovec *vector, int count) } #else _syscall3(ssize_t, readv, int, filedes, const struct iovec *, vector, - int, count); + int, count) #endif diff --git a/libc/sysdeps/linux/common/sigprocmask.c b/libc/sysdeps/linux/common/sigprocmask.c index ac68b3a53..011d7b367 100644 --- a/libc/sysdeps/linux/common/sigprocmask.c +++ b/libc/sysdeps/linux/common/sigprocmask.c @@ -19,9 +19,9 @@ libc_hidden_proto(sigprocmask) #ifdef __NR_rt_sigprocmask # define __NR___rt_sigprocmask __NR_rt_sigprocmask -static inline +static __always_inline _syscall4(int, __rt_sigprocmask, int, how, const sigset_t *, set, - sigset_t *, oldset, size_t, size); + sigset_t *, oldset, size_t, size) int sigprocmask(int how, const sigset_t * set, sigset_t * oldset) { @@ -54,9 +54,9 @@ int sigprocmask(int how, const sigset_t * set, sigset_t * oldset) #else # define __NR___syscall_sigprocmask __NR_sigprocmask -static inline +static __always_inline _syscall3(int, __syscall_sigprocmask, int, how, const sigset_t *, set, - sigset_t *, oldset); + sigset_t *, oldset) int sigprocmask(int how, const sigset_t * set, sigset_t * oldset) { diff --git a/libc/sysdeps/linux/common/waitid.c b/libc/sysdeps/linux/common/waitid.c index b8d2f70ba..237056516 100644 --- a/libc/sysdeps/linux/common/waitid.c +++ b/libc/sysdeps/linux/common/waitid.c @@ -12,5 +12,5 @@ #include <sys/types.h> #include <sys/wait.h> -_syscall4(int, waitid, idtype_t, idtype, id_t, id, siginfo_t*, infop, int, options); +_syscall4(int, waitid, idtype_t, idtype, id_t, id, siginfo_t*, infop, int, options) #endif diff --git a/libc/sysdeps/linux/common/writev.c b/libc/sysdeps/linux/common/writev.c index 464268b2f..bd0e4077d 100644 --- a/libc/sysdeps/linux/common/writev.c +++ b/libc/sysdeps/linux/common/writev.c @@ -26,7 +26,7 @@ static ssize_t __writev (int fd, const struct iovec *vector, int count) return bytes_written; /* glibc tries again, but we do not. */ - //return __atomic_writev_replacement (fd, vector, count); + /* return __atomic_writev_replacement (fd, vector, count); */ return -1; } @@ -46,5 +46,5 @@ ssize_t writev (int fd, const struct iovec *vector, int count) } #else _syscall3(ssize_t, writev, int, filedes, const struct iovec *, vector, - int, count); + int, count) #endif |