diff options
Diffstat (limited to 'ldso')
| -rw-r--r-- | ldso/include/dl-syscall.h | 42 | ||||
| -rw-r--r-- | ldso/ldso/sh/dl-sysdep.h | 2 |
2 files changed, 22 insertions, 22 deletions
diff --git a/ldso/include/dl-syscall.h b/ldso/include/dl-syscall.h index c0173838c..27af703e8 100644 --- a/ldso/include/dl-syscall.h +++ b/ldso/include/dl-syscall.h @@ -66,83 +66,83 @@ dynamic linking at all, so we cannot return any error codes. We just punt if there is an error. */ #define __NR__dl_exit __NR_exit -static __inline__ _syscall1(void, _dl_exit, int, status); +static inline _syscall1(void, _dl_exit, int, status); #define __NR__dl_close __NR_close -static __inline__ _syscall1(int, _dl_close, int, fd); +static inline _syscall1(int, _dl_close, int, fd); #define __NR__dl_open __NR_open -static __inline__ _syscall3(int, _dl_open, const char *, fn, int, flags, __kernel_mode_t, mode); +static inline _syscall3(int, _dl_open, const char *, fn, int, flags, __kernel_mode_t, mode); #define __NR__dl_write __NR_write -static __inline__ _syscall3(unsigned long, _dl_write, int, fd, +static inline _syscall3(unsigned long, _dl_write, int, fd, const void *, buf, unsigned long, count); #define __NR__dl_read __NR_read -static __inline__ _syscall3(unsigned long, _dl_read, int, fd, +static inline _syscall3(unsigned long, _dl_read, int, fd, const void *, buf, unsigned long, count); #define __NR__dl_mprotect __NR_mprotect -static __inline__ _syscall3(int, _dl_mprotect, const void *, addr, unsigned long, len, int, prot); +static inline _syscall3(int, _dl_mprotect, const void *, addr, unsigned long, len, int, prot); #define __NR__dl_stat __NR_stat -static __inline__ _syscall2(int, _dl_stat, const char *, file_name, struct stat *, buf); +static inline _syscall2(int, _dl_stat, const char *, file_name, struct stat *, buf); #define __NR__dl_fstat __NR_fstat -static __inline__ _syscall2(int, _dl_fstat, int, fd, struct stat *, buf); +static inline _syscall2(int, _dl_fstat, int, fd, struct stat *, buf); #define __NR__dl_munmap __NR_munmap -static __inline__ _syscall2(int, _dl_munmap, void *, start, unsigned long, length); +static inline _syscall2(int, _dl_munmap, void *, start, unsigned long, length); #ifdef __NR_getxuid # define __NR_getuid __NR_getxuid #endif #define __NR__dl_getuid __NR_getuid -static __inline__ _syscall0(uid_t, _dl_getuid); +static inline _syscall0(uid_t, _dl_getuid); #ifndef __NR_geteuid # define __NR_geteuid __NR_getuid #endif #define __NR__dl_geteuid __NR_geteuid -static __inline__ _syscall0(uid_t, _dl_geteuid); +static inline _syscall0(uid_t, _dl_geteuid); #ifdef __NR_getxgid # define __NR_getgid __NR_getxgid #endif #define __NR__dl_getgid __NR_getgid -static __inline__ _syscall0(gid_t, _dl_getgid); +static inline _syscall0(gid_t, _dl_getgid); #ifndef __NR_getegid # define __NR_getegid __NR_getgid #endif #define __NR__dl_getegid __NR_getegid -static __inline__ _syscall0(gid_t, _dl_getegid); +static inline _syscall0(gid_t, _dl_getegid); #ifdef __NR_getxpid # define __NR_getpid __NR_getxpid #endif #define __NR__dl_getpid __NR_getpid -static __inline__ _syscall0(gid_t, _dl_getpid); +static inline _syscall0(gid_t, _dl_getpid); #define __NR__dl_readlink __NR_readlink -static __inline__ _syscall3(int, _dl_readlink, const char *, path, char *, buf, size_t, bufsiz); +static inline _syscall3(int, _dl_readlink, const char *, path, char *, buf, size_t, bufsiz); #ifdef __UCLIBC_HAS_SSP__ #include <sys/time.h> #define __NR__dl_gettimeofday __NR_gettimeofday -static __inline__ _syscall2(int, _dl_gettimeofday, struct timeval *, tv, struct timezone *, tz); +static inline _syscall2(int, _dl_gettimeofday, struct timeval *, tv, struct timezone *, tz); #endif #ifdef __NR_mmap #ifdef __UCLIBC_MMAP_HAS_6_ARGS__ #define __NR__dl_mmap __NR_mmap -static __inline__ _syscall6(void *, _dl_mmap, void *, start, size_t, length, +static inline _syscall6(void *, _dl_mmap, void *, start, size_t, length, int, prot, int, flags, int, fd, off_t, offset); #else #define __NR__dl_mmap_real __NR_mmap -static __inline__ _syscall1(void *, _dl_mmap_real, unsigned long *, buffer); +static inline _syscall1(void *, _dl_mmap_real, unsigned long *, buffer); -static __inline__ void * _dl_mmap(void * addr, unsigned long size, int prot, +static inline void * _dl_mmap(void * addr, unsigned long size, int prot, int flags, int fd, unsigned long offset) { unsigned long buffer[6]; @@ -158,11 +158,11 @@ static __inline__ void * _dl_mmap(void * addr, unsigned long size, int prot, #endif #elif defined __NR_mmap2 #define __NR___syscall_mmap2 __NR_mmap2 -static __inline__ _syscall6(__ptr_t, __syscall_mmap2, __ptr_t, addr, +static inline _syscall6(__ptr_t, __syscall_mmap2, __ptr_t, addr, size_t, len, int, prot, int, flags, int, fd, off_t, offset); /*always 12, even on architectures where PAGE_SHIFT != 12 */ #define MMAP2_PAGE_SHIFT 12 -static __inline__ void * _dl_mmap(void * addr, unsigned long size, int prot, +static inline void * _dl_mmap(void * addr, unsigned long size, int prot, int flags, int fd, unsigned long offset) { if (offset & ((1 << MMAP2_PAGE_SHIFT) - 1)) diff --git a/ldso/ldso/sh/dl-sysdep.h b/ldso/ldso/sh/dl-sysdep.h index 210d8526d..da109782e 100644 --- a/ldso/ldso/sh/dl-sysdep.h +++ b/ldso/ldso/sh/dl-sysdep.h @@ -25,7 +25,7 @@ struct elf_resolve; extern unsigned long _dl_linux_resolver(struct elf_resolve * tpnt, int reloc_entry); -static __inline__ unsigned int +static inline unsigned int _dl_urem(unsigned int n, unsigned int base) { int res; |