diff options
Diffstat (limited to 'libexec')
-rw-r--r-- | libexec/ld.so/aarch64/archdep.h | 9 | ||||
-rw-r--r-- | libexec/ld.so/aarch64/syscall.h | 11 | ||||
-rw-r--r-- | libexec/ld.so/alpha/syscall.h | 4 | ||||
-rw-r--r-- | libexec/ld.so/amd64/archdep.h | 9 | ||||
-rw-r--r-- | libexec/ld.so/amd64/syscall.h | 11 | ||||
-rw-r--r-- | libexec/ld.so/arm/archdep.h | 9 | ||||
-rw-r--r-- | libexec/ld.so/arm/syscall.h | 11 | ||||
-rw-r--r-- | libexec/ld.so/hppa/archdep.h | 9 | ||||
-rw-r--r-- | libexec/ld.so/hppa/syscall.h | 11 | ||||
-rw-r--r-- | libexec/ld.so/i386/archdep.h | 16 | ||||
-rw-r--r-- | libexec/ld.so/i386/syscall.h | 18 | ||||
-rw-r--r-- | libexec/ld.so/m88k/syscall.h | 8 | ||||
-rw-r--r-- | libexec/ld.so/mips64/syscall.h | 8 | ||||
-rw-r--r-- | libexec/ld.so/sh/archdep.h | 9 | ||||
-rw-r--r-- | libexec/ld.so/sh/syscall.h | 11 | ||||
-rw-r--r-- | libexec/ld.so/sparc64/archdep.h | 8 | ||||
-rw-r--r-- | libexec/ld.so/sparc64/syscall.h | 11 |
17 files changed, 87 insertions, 86 deletions
diff --git a/libexec/ld.so/aarch64/archdep.h b/libexec/ld.so/aarch64/archdep.h index 82d7e25714d..4b3b13b6d11 100644 --- a/libexec/ld.so/aarch64/archdep.h +++ b/libexec/ld.so/aarch64/archdep.h @@ -1,4 +1,4 @@ -/* $OpenBSD: archdep.h,v 1.2 2017/01/20 10:40:30 guenther Exp $ */ +/* $OpenBSD: archdep.h,v 1.3 2017/01/21 01:15:00 guenther Exp $ */ /* * Copyright (c) 1998 Per Fogelstrom, Opsycon AB @@ -38,13 +38,6 @@ #include "syscall.h" #include "util.h" -static inline void * -_dl_mmap(void *addr, size_t len, int prot, int flags, int fd, off_t offset) -{ - return((void *)_dl__syscall((quad_t)SYS_mmap, addr, len, prot, - flags, fd, 0, offset)); -} - static inline void RELOC_DYN(Elf64_Rela *r, const Elf64_Sym *s, Elf64_Addr *p, unsigned long v) diff --git a/libexec/ld.so/aarch64/syscall.h b/libexec/ld.so/aarch64/syscall.h index 6160e700a55..56d19a816f7 100644 --- a/libexec/ld.so/aarch64/syscall.h +++ b/libexec/ld.so/aarch64/syscall.h @@ -1,4 +1,4 @@ -/* $OpenBSD: syscall.h,v 1.1 2017/01/11 14:11:27 patrick Exp $ */ +/* $OpenBSD: syscall.h,v 1.2 2017/01/21 01:15:00 guenther Exp $ */ /* * Copyright (c) 2001 Niklas Hallqvist @@ -40,7 +40,7 @@ int _dl_close(int); __dead -int _dl_exit(int); +void _dl_exit(int); int _dl_issetugid(void); int _dl_getthrid(void); long _dl__syscall(quad_t, ...); @@ -59,4 +59,11 @@ int _dl_getentropy(char *, size_t); int _dl_sendsyslog(const char *, size_t, int); void _dl_set_tcb(void *); +static inline void * +_dl_mmap(void *addr, size_t len, int prot, int flags, int fd, off_t offset) +{ + return (void *)_dl__syscall(SYS_mmap, addr, len, prot, + flags, fd, 0, offset); +} + #endif /*__DL_SYSCALL_H__*/ diff --git a/libexec/ld.so/alpha/syscall.h b/libexec/ld.so/alpha/syscall.h index b60e10a099f..49203b0b761 100644 --- a/libexec/ld.so/alpha/syscall.h +++ b/libexec/ld.so/alpha/syscall.h @@ -1,4 +1,4 @@ -/* $OpenBSD: syscall.h,v 1.36 2016/08/31 13:18:57 guenther Exp $ */ +/* $OpenBSD: syscall.h,v 1.37 2017/01/21 01:15:00 guenther Exp $ */ /* * Copyright (c) 2001 Niklas Hallqvist @@ -39,7 +39,7 @@ int _dl_close(int); __dead -int _dl_exit(int); +void _dl_exit(int); int _dl_issetugid(void); int _dl_getthrid(void); void * _dl_mmap(void *, size_t, int, int, int, off_t); diff --git a/libexec/ld.so/amd64/archdep.h b/libexec/ld.so/amd64/archdep.h index c7dc2197ca2..0b1f8e3fd05 100644 --- a/libexec/ld.so/amd64/archdep.h +++ b/libexec/ld.so/amd64/archdep.h @@ -1,4 +1,4 @@ -/* $OpenBSD: archdep.h,v 1.10 2017/01/20 10:40:30 guenther Exp $ */ +/* $OpenBSD: archdep.h,v 1.11 2017/01/21 01:15:00 guenther Exp $ */ /* * Copyright (c) 1998 Per Fogelstrom, Opsycon AB @@ -38,13 +38,6 @@ #include "syscall.h" #include "util.h" -static inline void * -_dl_mmap(void *addr, size_t len, int prot, int flags, int fd, off_t offset) -{ - return((void *)_dl__syscall((quad_t)SYS_mmap, addr, len, prot, - flags, fd, 0, offset)); -} - static inline void RELOC_DYN(Elf64_Rela *r, const Elf64_Sym *s, Elf64_Addr *p, unsigned long v) diff --git a/libexec/ld.so/amd64/syscall.h b/libexec/ld.so/amd64/syscall.h index a19798aa77d..0af7eefea86 100644 --- a/libexec/ld.so/amd64/syscall.h +++ b/libexec/ld.so/amd64/syscall.h @@ -1,4 +1,4 @@ -/* $OpenBSD: syscall.h,v 1.23 2016/08/28 06:15:32 guenther Exp $ */ +/* $OpenBSD: syscall.h,v 1.24 2017/01/21 01:15:00 guenther Exp $ */ /* * Copyright (c) 2001 Niklas Hallqvist @@ -40,7 +40,7 @@ int _dl_close(int); __dead -int _dl_exit(int); +void _dl_exit(int); int _dl_issetugid(void); int _dl_getthrid(void); long _dl__syscall(quad_t, ...); @@ -59,4 +59,11 @@ int _dl_getentropy(char *, size_t); int _dl_sendsyslog(const char *, size_t, int); void _dl_set_tcb(void *); +static inline void * +_dl_mmap(void *addr, size_t len, int prot, int flags, int fd, off_t offset) +{ + return (void *)_dl__syscall(SYS_mmap, addr, len, prot, + flags, fd, 0, offset); +} + #endif /*__DL_SYSCALL_H__*/ diff --git a/libexec/ld.so/arm/archdep.h b/libexec/ld.so/arm/archdep.h index 5dbd286ddcd..20f45811f24 100644 --- a/libexec/ld.so/arm/archdep.h +++ b/libexec/ld.so/arm/archdep.h @@ -1,4 +1,4 @@ -/* $OpenBSD: archdep.h,v 1.10 2017/01/20 10:40:30 guenther Exp $ */ +/* $OpenBSD: archdep.h,v 1.11 2017/01/21 01:15:00 guenther Exp $ */ /* * Copyright (c) 1998 Per Fogelstrom, Opsycon AB @@ -43,13 +43,6 @@ * be used before bootstrap linking has been finished. */ -static inline void * -_dl_mmap(void *addr, size_t len, int prot, int flags, int fd, off_t offset) -{ - return((void *)_dl__syscall((quad_t)SYS_mmap, addr, len, prot, - flags, fd, 0, offset)); -} - static inline void RELOC_DYN(Elf_Rel *r, const Elf_Sym *s, Elf_Addr *p, unsigned long v) { diff --git a/libexec/ld.so/arm/syscall.h b/libexec/ld.so/arm/syscall.h index 330fdbccbb8..280d1474983 100644 --- a/libexec/ld.so/arm/syscall.h +++ b/libexec/ld.so/arm/syscall.h @@ -1,4 +1,4 @@ -/* $OpenBSD: syscall.h,v 1.23 2016/08/28 06:15:32 guenther Exp $ */ +/* $OpenBSD: syscall.h,v 1.24 2017/01/21 01:15:00 guenther Exp $ */ /* * Copyright (c) 2001 Niklas Hallqvist @@ -40,7 +40,7 @@ int _dl_close(int); __dead -int _dl_exit(int); +void _dl_exit(int); int _dl_issetugid(void); int _dl_getthrid(void); long _dl__syscall(quad_t, ...); @@ -59,4 +59,11 @@ int _dl_getentropy(char *, size_t); int _dl_sendsyslog(const char *, size_t, int); void _dl_set_tcb(void *); +static inline void * +_dl_mmap(void *addr, size_t len, int prot, int flags, int fd, off_t offset) +{ + return (void *)_dl__syscall(SYS_mmap, addr, len, prot, + flags, fd, 0, offset); +} + #endif /*__DL_SYSCALL_H__*/ diff --git a/libexec/ld.so/hppa/archdep.h b/libexec/ld.so/hppa/archdep.h index 6761f6ec995..255c4850004 100644 --- a/libexec/ld.so/hppa/archdep.h +++ b/libexec/ld.so/hppa/archdep.h @@ -1,4 +1,4 @@ -/* $OpenBSD: archdep.h,v 1.13 2017/01/20 10:40:30 guenther Exp $ */ +/* $OpenBSD: archdep.h,v 1.14 2017/01/21 01:15:00 guenther Exp $ */ /* * Copyright (c) 2004 Michael Shalayeff @@ -40,13 +40,6 @@ #include "syscall.h" #include "util.h" -static inline void * -_dl_mmap(void *addr, size_t len, int prot, int flags, int fd, off_t offset) -{ - return((void *)_dl__syscall((quad_t)SYS_mmap, addr, len, prot, - flags, fd, 0, offset)); -} - static inline void RELOC_JMPREL(Elf_RelA *r, const Elf_Sym *s, Elf_Addr *p, unsigned long v, diff --git a/libexec/ld.so/hppa/syscall.h b/libexec/ld.so/hppa/syscall.h index a19798aa77d..0af7eefea86 100644 --- a/libexec/ld.so/hppa/syscall.h +++ b/libexec/ld.so/hppa/syscall.h @@ -1,4 +1,4 @@ -/* $OpenBSD: syscall.h,v 1.23 2016/08/28 06:15:32 guenther Exp $ */ +/* $OpenBSD: syscall.h,v 1.24 2017/01/21 01:15:00 guenther Exp $ */ /* * Copyright (c) 2001 Niklas Hallqvist @@ -40,7 +40,7 @@ int _dl_close(int); __dead -int _dl_exit(int); +void _dl_exit(int); int _dl_issetugid(void); int _dl_getthrid(void); long _dl__syscall(quad_t, ...); @@ -59,4 +59,11 @@ int _dl_getentropy(char *, size_t); int _dl_sendsyslog(const char *, size_t, int); void _dl_set_tcb(void *); +static inline void * +_dl_mmap(void *addr, size_t len, int prot, int flags, int fd, off_t offset) +{ + return (void *)_dl__syscall(SYS_mmap, addr, len, prot, + flags, fd, 0, offset); +} + #endif /*__DL_SYSCALL_H__*/ diff --git a/libexec/ld.so/i386/archdep.h b/libexec/ld.so/i386/archdep.h index a5cf222b6b0..69857cfa091 100644 --- a/libexec/ld.so/i386/archdep.h +++ b/libexec/ld.so/i386/archdep.h @@ -1,4 +1,4 @@ -/* $OpenBSD: archdep.h,v 1.17 2017/01/20 10:40:30 guenther Exp $ */ +/* $OpenBSD: archdep.h,v 1.18 2017/01/21 01:15:00 guenther Exp $ */ /* * Copyright (c) 1998 Per Fogelstrom, Opsycon AB @@ -38,20 +38,6 @@ #include "syscall.h" #include "util.h" -static inline void * -_dl_mmap(void *addr, size_t len, int prot, int flags, int fd, off_t offset) -{ - return((void *)_dl__syscall((quad_t)SYS_mmap, addr, len, prot, - flags, fd, 0, offset)); -} - -static inline void * -_dl_mquery(void *addr, size_t len, int prot, int flags, int fd, off_t offset) -{ - return((void *)_dl__syscall((quad_t)SYS_mquery, addr, len, prot, - flags, fd, 0, offset)); -} - static inline void RELOC_DYN(Elf32_Rel *r, const Elf32_Sym *s, Elf32_Addr *p, unsigned long v) diff --git a/libexec/ld.so/i386/syscall.h b/libexec/ld.so/i386/syscall.h index dacac9c20cb..a4ec39e9026 100644 --- a/libexec/ld.so/i386/syscall.h +++ b/libexec/ld.so/i386/syscall.h @@ -1,4 +1,4 @@ -/* $OpenBSD: syscall.h,v 1.27 2016/08/28 06:15:32 guenther Exp $ */ +/* $OpenBSD: syscall.h,v 1.28 2017/01/21 01:15:00 guenther Exp $ */ /* * Copyright (c) 2001 Niklas Hallqvist @@ -40,7 +40,7 @@ int _dl_close(int); __dead -int _dl_exit(int); +void _dl_exit(int); int _dl_issetugid(void); int _dl_getthrid(void); long _dl__syscall(quad_t, ...); @@ -59,4 +59,18 @@ int _dl_getentropy(char *, size_t); int _dl_sendsyslog(const char *, size_t, int); void _dl_set_tcb(void *); +static inline void * +_dl_mmap(void *addr, size_t len, int prot, int flags, int fd, off_t offset) +{ + return (void *)_dl__syscall(SYS_mmap, addr, len, prot, + flags, fd, 0, offset); +} + +static inline void * +_dl_mquery(void *addr, size_t len, int prot, int flags, int fd, off_t offset) +{ + return (void *)_dl__syscall(SYS_mquery, addr, len, prot, + flags, fd, 0, offset); +} + #endif /*__DL_SYSCALL_H__*/ diff --git a/libexec/ld.so/m88k/syscall.h b/libexec/ld.so/m88k/syscall.h index 885413b87f6..87aa864536a 100644 --- a/libexec/ld.so/m88k/syscall.h +++ b/libexec/ld.so/m88k/syscall.h @@ -1,4 +1,4 @@ -/* $OpenBSD: syscall.h,v 1.19 2016/08/28 06:15:32 guenther Exp $ */ +/* $OpenBSD: syscall.h,v 1.20 2017/01/21 01:15:00 guenther Exp $ */ /* * Copyright (c) 2001 Niklas Hallqvist @@ -40,7 +40,7 @@ int _dl_close(int); __dead -int _dl_exit(int); +void _dl_exit(int); int _dl_issetugid(void); int _dl_getthrid(void); long _dl__syscall(quad_t, ...); @@ -61,8 +61,8 @@ int _dl_sendsyslog(const char *, size_t, int); static inline void * _dl_mmap(void *addr, size_t len, int prot, int flags, int fd, off_t offset) { - return((void *)(long)_dl__syscall((quad_t)SYS_mmap, addr, len, prot, - flags, fd, 0, offset)); + return (void *)_dl__syscall(SYS_mmap, addr, len, prot, + flags, fd, 0, offset); } int _dl_cacheflush(unsigned long, size_t); diff --git a/libexec/ld.so/mips64/syscall.h b/libexec/ld.so/mips64/syscall.h index f2e83fab26d..f7774657729 100644 --- a/libexec/ld.so/mips64/syscall.h +++ b/libexec/ld.so/mips64/syscall.h @@ -1,4 +1,4 @@ -/* $OpenBSD: syscall.h,v 1.25 2016/08/28 06:15:32 guenther Exp $ */ +/* $OpenBSD: syscall.h,v 1.26 2017/01/21 01:15:00 guenther Exp $ */ /* * Copyright (c) 1998-2002 Opsycon AB, Sweden. @@ -39,7 +39,7 @@ int _dl_close(int); __dead -int _dl_exit(int); +void _dl_exit(int); int _dl_fstat(int, struct stat *); int _dl_getcwd(char *, size_t); ssize_t _dl_getdents(int, char *, size_t); @@ -61,8 +61,8 @@ int _dl_sendsyslog(const char *, size_t, int); static inline void * _dl_mmap(void *addr, size_t len, int prot, int flags, int fd, off_t offset) { - return((void *)_dl__syscall((quad_t)SYS_mmap, addr, len, prot, - flags, fd, 0, offset)); + return (void *)_dl__syscall(SYS_mmap, addr, len, prot, + flags, fd, 0, offset); } #endif /*__DL_SYSCALL_H__*/ diff --git a/libexec/ld.so/sh/archdep.h b/libexec/ld.so/sh/archdep.h index 3366a1fb44c..15c1066ea49 100644 --- a/libexec/ld.so/sh/archdep.h +++ b/libexec/ld.so/sh/archdep.h @@ -1,4 +1,4 @@ -/* $OpenBSD: archdep.h,v 1.8 2017/01/20 10:40:30 guenther Exp $ */ +/* $OpenBSD: archdep.h,v 1.9 2017/01/21 01:15:00 guenther Exp $ */ /* * Copyright (c) 1998 Per Fogelstrom, Opsycon AB @@ -43,13 +43,6 @@ * be used before bootstrap linking has been finished. */ -static inline void * -_dl_mmap(void *addr, size_t len, int prot, int flags, int fd, off_t offset) -{ - return((void *)(long)_dl__syscall((quad_t)SYS_mmap, addr, len, prot, - flags, fd, 0, offset)); -} - static inline void RELOC_DYN(Elf32_Rela *r, const Elf32_Sym *s, Elf32_Addr *p, unsigned long v) { diff --git a/libexec/ld.so/sh/syscall.h b/libexec/ld.so/sh/syscall.h index df09230bcc3..72828b99cba 100644 --- a/libexec/ld.so/sh/syscall.h +++ b/libexec/ld.so/sh/syscall.h @@ -1,4 +1,4 @@ -/* $OpenBSD: syscall.h,v 1.22 2016/08/31 13:18:57 guenther Exp $ */ +/* $OpenBSD: syscall.h,v 1.23 2017/01/21 01:15:00 guenther Exp $ */ /* * Copyright (c) 2001 Niklas Hallqvist @@ -40,7 +40,7 @@ int _dl_close(int); __dead -int _dl_exit(int); +void _dl_exit(int); int _dl_issetugid(void); int _dl_getthrid(void); long _dl__syscall(quad_t, ...); @@ -58,4 +58,11 @@ int _dl_utrace(const char *, const void *, size_t); int _dl_getentropy(char *, size_t); int _dl_sendsyslog(const char *, size_t, int); +static inline void * +_dl_mmap(void *addr, size_t len, int prot, int flags, int fd, off_t offset) +{ + return (void *)_dl__syscall(SYS_mmap, addr, len, prot, + flags, fd, 0, offset); +} + #endif /*__DL_SYSCALL_H__*/ diff --git a/libexec/ld.so/sparc64/archdep.h b/libexec/ld.so/sparc64/archdep.h index 47ffa8932cd..84217ea7827 100644 --- a/libexec/ld.so/sparc64/archdep.h +++ b/libexec/ld.so/sparc64/archdep.h @@ -1,4 +1,4 @@ -/* $OpenBSD: archdep.h,v 1.23 2017/01/20 10:40:30 guenther Exp $ */ +/* $OpenBSD: archdep.h,v 1.24 2017/01/21 01:15:00 guenther Exp $ */ /* * Copyright (c) 1998 Per Fogelstrom, Opsycon AB @@ -38,12 +38,6 @@ #include "syscall.h" #include "util.h" -static inline void * -_dl_mmap(void *addr, size_t len, int prot, int flags, int fd, off_t offset) -{ - return((void *)_dl__syscall((quad_t)SYS_mmap, addr, len, prot, - flags, fd, 0, offset)); -} static inline void RELOC_DYN(Elf_RelA *r, const Elf_Sym *s, Elf_Addr *p, unsigned long v) diff --git a/libexec/ld.so/sparc64/syscall.h b/libexec/ld.so/sparc64/syscall.h index 07def710309..f756b6da1d8 100644 --- a/libexec/ld.so/sparc64/syscall.h +++ b/libexec/ld.so/sparc64/syscall.h @@ -1,4 +1,4 @@ -/* $OpenBSD: syscall.h,v 1.35 2016/08/28 06:15:33 guenther Exp $ */ +/* $OpenBSD: syscall.h,v 1.36 2017/01/21 01:15:00 guenther Exp $ */ /* * Copyright (c) 2001 Niklas Hallqvist @@ -40,7 +40,7 @@ int _dl_close(int); __dead -int _dl_exit(int); +void _dl_exit(int); int _dl_issetugid(void); int _dl_getthrid(void); long _dl__syscall(quad_t, ...); @@ -58,4 +58,11 @@ int _dl_utrace(const char *, const void *, size_t); int _dl_getentropy(char *, size_t); int _dl_sendsyslog(const char *, size_t, int); +static inline void * +_dl_mmap(void *addr, size_t len, int prot, int flags, int fd, off_t offset) +{ + return (void *)_dl__syscall(SYS_mmap, addr, len, prot, + flags, fd, 0, offset); +} + #endif /*__DL_SYSCALL_H__*/ |