unify the various per-arch syscall.h as much as possible

ok kettenis guenther

11 files changed, 80 insertions, 74 deletions

diff --git a/libexec/ld.so/aarch64/syscall.h b/libexec/ld.so/aarch64/syscall.h
index 34d7ec3ea57..8eeccf5a400 100644
--- a/libexec/ld.so/aarch64/syscall.h
+++ b/libexec/ld.so/aarch64/syscall.h
@@ -1,7 +1,7 @@
-/*	$OpenBSD: syscall.h,v 1.5 2017/08/28 03:14:01 jsg Exp $ */
+/*	$OpenBSD: syscall.h,v 1.6 2018/07/09 10:12:14 deraadt Exp $ */
 
 /*
- * Copyright (c) 2001 Niklas Hallqvist
+ * Copyright (c) 1998 Per Fogelstrom, Opsycon AB
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
@@ -41,19 +41,19 @@
 int	_dl_close(int);
 __dead
 void	_dl_exit(int);
+int	_dl_fstat(int, struct stat *);
+int	_dl___getcwd(char *, size_t);
+ssize_t	_dl_getdents(int, char *, size_t);
 int	_dl_issetugid(void);
 int	_dl_getthrid(void);
-long	_dl___syscall(quad_t, ...);
 int	_dl_mprotect(const void *, size_t, int);
 int	_dl_munmap(const void *, size_t);
 int	_dl_open(const char *, int);
 ssize_t	_dl_read(int, const char *, size_t);
-int	_dl_fstat(int, struct stat *);
-ssize_t	_dl_getdents(int, char *, size_t);
-int	_dl_sysctl(const int *, u_int, void *, size_t *, void *, size_t);
 ssize_t	_dl_readlink(const char *, char *, size_t);
 int	_dl_pledge(const char *, const char **);
-int	_dl___getcwd(char *, size_t);
+long	_dl___syscall(quad_t, ...);
+int	_dl_sysctl(const int *, u_int, void *, size_t *, void *, size_t);
 int	_dl_utrace(const char *, const void *, size_t);
 int	_dl_getentropy(char *, size_t);
 int	_dl_sendsyslog(const char *, size_t, int);
diff --git a/libexec/ld.so/alpha/syscall.h b/libexec/ld.so/alpha/syscall.h
index 823ed2cbe87..c51ce2d1dfe 100644
--- a/libexec/ld.so/alpha/syscall.h
+++ b/libexec/ld.so/alpha/syscall.h
@@ -1,7 +1,7 @@
-/*	$OpenBSD: syscall.h,v 1.39 2017/08/27 21:59:52 deraadt Exp $ */
+/*	$OpenBSD: syscall.h,v 1.40 2018/07/09 10:12:14 deraadt Exp $ */
 
 /*
- * Copyright (c) 2001 Niklas Hallqvist
+ * Copyright (c) 1998 Per Fogelstrom, Opsycon AB
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
@@ -25,37 +25,39 @@
  * SUCH DAMAGE.
  *
  */
+
 #ifndef __DL_SYSCALL_H__
 #define __DL_SYSCALL_H__
 
-#include <sys/stat.h>
 #include <sys/syscall.h>
+#include <sys/stat.h>
 
 #ifndef _dl_MAX_ERRNO
 #define _dl_MAX_ERRNO 512L
 #endif
 #define _dl_mmap_error(__res) \
-    ((long) __res < 0 && (long) __res >= -_dl_MAX_ERRNO)
+    ((long)__res < 0 && (long)__res >= -_dl_MAX_ERRNO)
 
 int	_dl_close(int);
 __dead
 void	_dl_exit(int);
+int	_dl_fstat(int, struct stat *);
+int	_dl___getcwd(char *, size_t);
+ssize_t	_dl_getdents(int, char *, size_t);
 int	_dl_issetugid(void);
 int	_dl_getthrid(void);
 int	_dl_mprotect(const void *, size_t, int);
 int	_dl_munmap(const void *, size_t);
 int	_dl_open(const char *, int);
 ssize_t	_dl_read(int, const char *, size_t);
-int	_dl_fstat(int, struct stat *);
-ssize_t	_dl_getdents(int, char *, size_t);
-long	_dl___syscall(quad_t, ...);
-int	_dl_sysctl(const int *, u_int, void *, size_t *, void *, size_t);
 ssize_t	_dl_readlink(const char *, char *, size_t);
 int	_dl_pledge(const char *, const char **);
-int	_dl___getcwd(char *, size_t);
+long	_dl___syscall(quad_t, ...);
+int	_dl_sysctl(const int *, u_int, void *, size_t *, void *, size_t);
 int	_dl_utrace(const char *, const void *, size_t);
 int	_dl_getentropy(char *, size_t);
 int	_dl_sendsyslog(const char *, size_t, int);
+void	_dl___set_tcb(void *);
 __dead
 void	_dl_thrkill(pid_t, int, void *);
 
diff --git a/libexec/ld.so/amd64/syscall.h b/libexec/ld.so/amd64/syscall.h
index f3e33ccf681..2bf4aabcf94 100644
--- a/libexec/ld.so/amd64/syscall.h
+++ b/libexec/ld.so/amd64/syscall.h
@@ -1,7 +1,7 @@
-/*	$OpenBSD: syscall.h,v 1.26 2017/08/27 21:59:52 deraadt Exp $	*/
+/*	$OpenBSD: syscall.h,v 1.27 2018/07/09 10:12:14 deraadt Exp $ */
 
 /*
- * Copyright (c) 2001 Niklas Hallqvist
+ * Copyright (c) 1998 Per Fogelstrom, Opsycon AB
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
@@ -41,19 +41,19 @@
 int	_dl_close(int);
 __dead
 void	_dl_exit(int);
+int	_dl_fstat(int, struct stat *);
+int	_dl___getcwd(char *, size_t);
+ssize_t	_dl_getdents(int, char *, size_t);
 int	_dl_issetugid(void);
 int	_dl_getthrid(void);
-long	_dl___syscall(quad_t, ...);
 int	_dl_mprotect(const void *, size_t, int);
 int	_dl_munmap(const void *, size_t);
 int	_dl_open(const char *, int);
 ssize_t	_dl_read(int, const char *, size_t);
-int	_dl_fstat(int, struct stat *);
-ssize_t	_dl_getdents(int, char *, size_t);
-int	_dl_sysctl(const int *, u_int, void *, size_t *, void *, size_t);
 ssize_t	_dl_readlink(const char *, char *, size_t);
 int	_dl_pledge(const char *, const char **);
-int	_dl___getcwd(char *, size_t);
+long	_dl___syscall(quad_t, ...);
+int	_dl_sysctl(const int *, u_int, void *, size_t *, void *, size_t);
 int	_dl_utrace(const char *, const void *, size_t);
 int	_dl_getentropy(char *, size_t);
 int	_dl_sendsyslog(const char *, size_t, int);
diff --git a/libexec/ld.so/arm/syscall.h b/libexec/ld.so/arm/syscall.h
index 95432fa20b4..2bf4aabcf94 100644
--- a/libexec/ld.so/arm/syscall.h
+++ b/libexec/ld.so/arm/syscall.h
@@ -1,7 +1,7 @@
-/*	$OpenBSD: syscall.h,v 1.26 2017/08/27 21:59:52 deraadt Exp $ */
+/*	$OpenBSD: syscall.h,v 1.27 2018/07/09 10:12:14 deraadt Exp $ */
 
 /*
- * Copyright (c) 2001 Niklas Hallqvist
+ * Copyright (c) 1998 Per Fogelstrom, Opsycon AB
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
@@ -41,19 +41,19 @@
 int	_dl_close(int);
 __dead
 void	_dl_exit(int);
+int	_dl_fstat(int, struct stat *);
+int	_dl___getcwd(char *, size_t);
+ssize_t	_dl_getdents(int, char *, size_t);
 int	_dl_issetugid(void);
 int	_dl_getthrid(void);
-long	_dl___syscall(quad_t, ...);
 int	_dl_mprotect(const void *, size_t, int);
 int	_dl_munmap(const void *, size_t);
 int	_dl_open(const char *, int);
 ssize_t	_dl_read(int, const char *, size_t);
-int	_dl_fstat(int, struct stat *);
-ssize_t	_dl_getdents(int, char *, size_t);
-int	_dl_sysctl(const int *, u_int, void *, size_t *, void *, size_t);
 ssize_t	_dl_readlink(const char *, char *, size_t);
 int	_dl_pledge(const char *, const char **);
-int	_dl___getcwd(char *, size_t);
+long	_dl___syscall(quad_t, ...);
+int	_dl_sysctl(const int *, u_int, void *, size_t *, void *, size_t);
 int	_dl_utrace(const char *, const void *, size_t);
 int	_dl_getentropy(char *, size_t);
 int	_dl_sendsyslog(const char *, size_t, int);
diff --git a/libexec/ld.so/hppa/syscall.h b/libexec/ld.so/hppa/syscall.h
index f3e33ccf681..2bf4aabcf94 100644
--- a/libexec/ld.so/hppa/syscall.h
+++ b/libexec/ld.so/hppa/syscall.h
@@ -1,7 +1,7 @@
-/*	$OpenBSD: syscall.h,v 1.26 2017/08/27 21:59:52 deraadt Exp $	*/
+/*	$OpenBSD: syscall.h,v 1.27 2018/07/09 10:12:14 deraadt Exp $ */
 
 /*
- * Copyright (c) 2001 Niklas Hallqvist
+ * Copyright (c) 1998 Per Fogelstrom, Opsycon AB
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
@@ -41,19 +41,19 @@
 int	_dl_close(int);
 __dead
 void	_dl_exit(int);
+int	_dl_fstat(int, struct stat *);
+int	_dl___getcwd(char *, size_t);
+ssize_t	_dl_getdents(int, char *, size_t);
 int	_dl_issetugid(void);
 int	_dl_getthrid(void);
-long	_dl___syscall(quad_t, ...);
 int	_dl_mprotect(const void *, size_t, int);
 int	_dl_munmap(const void *, size_t);
 int	_dl_open(const char *, int);
 ssize_t	_dl_read(int, const char *, size_t);
-int	_dl_fstat(int, struct stat *);
-ssize_t	_dl_getdents(int, char *, size_t);
-int	_dl_sysctl(const int *, u_int, void *, size_t *, void *, size_t);
 ssize_t	_dl_readlink(const char *, char *, size_t);
 int	_dl_pledge(const char *, const char **);
-int	_dl___getcwd(char *, size_t);
+long	_dl___syscall(quad_t, ...);
+int	_dl_sysctl(const int *, u_int, void *, size_t *, void *, size_t);
 int	_dl_utrace(const char *, const void *, size_t);
 int	_dl_getentropy(char *, size_t);
 int	_dl_sendsyslog(const char *, size_t, int);
diff --git a/libexec/ld.so/i386/syscall.h b/libexec/ld.so/i386/syscall.h
index 16634edd40b..fb1833eb3f5 100644
--- a/libexec/ld.so/i386/syscall.h
+++ b/libexec/ld.so/i386/syscall.h
@@ -1,7 +1,7 @@
-/*	$OpenBSD: syscall.h,v 1.30 2017/08/27 21:59:52 deraadt Exp $ */
+/*	$OpenBSD: syscall.h,v 1.31 2018/07/09 10:12:14 deraadt Exp $ */
 
 /*
- * Copyright (c) 2001 Niklas Hallqvist
+ * Copyright (c) 1998 Per Fogelstrom, Opsycon AB
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
@@ -41,19 +41,19 @@
 int	_dl_close(int);
 __dead
 void	_dl_exit(int);
+int	_dl_fstat(int, struct stat *);
+int	_dl___getcwd(char *, size_t);
+ssize_t	_dl_getdents(int, char *, size_t);
 int	_dl_issetugid(void);
 int	_dl_getthrid(void);
-long	_dl___syscall(quad_t, ...);
 int	_dl_mprotect(const void *, size_t, int);
 int	_dl_munmap(const void *, size_t);
 int	_dl_open(const char *, int);
 ssize_t	_dl_read(int, const char *, size_t);
-int	_dl_fstat(int, struct stat *);
-ssize_t	_dl_getdents(int, char *, size_t);
-int	_dl_sysctl(const int *, u_int, void *, size_t *, void *, size_t);
 ssize_t	_dl_readlink(const char *, char *, size_t);
 int	_dl_pledge(const char *, const char **);
-int	_dl___getcwd(char *, size_t);
+long	_dl___syscall(quad_t, ...);
+int	_dl_sysctl(const int *, u_int, void *, size_t *, void *, size_t);
 int	_dl_utrace(const char *, const void *, size_t);
 int	_dl_getentropy(char *, size_t);
 int	_dl_sendsyslog(const char *, size_t, int);
diff --git a/libexec/ld.so/m88k/syscall.h b/libexec/ld.so/m88k/syscall.h
index 7ec9c537f9c..f04c2901218 100644
--- a/libexec/ld.so/m88k/syscall.h
+++ b/libexec/ld.so/m88k/syscall.h
@@ -1,7 +1,7 @@
-/*	$OpenBSD: syscall.h,v 1.22 2017/08/27 21:59:52 deraadt Exp $ */
+/*	$OpenBSD: syscall.h,v 1.23 2018/07/09 10:12:14 deraadt Exp $ */
 
 /*
- * Copyright (c) 2001 Niklas Hallqvist
+ * Copyright (c) 1998 Per Fogelstrom, Opsycon AB
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
@@ -41,22 +41,23 @@
 int	_dl_close(int);
 __dead
 void	_dl_exit(int);
+int	_dl_fstat(int, struct stat *);
+int	_dl___getcwd(char *, size_t);
+ssize_t	_dl_getdents(int, char *, size_t);
 int	_dl_issetugid(void);
 int	_dl_getthrid(void);
-long	_dl___syscall(quad_t, ...);
 int	_dl_mprotect(const void *, size_t, int);
 int	_dl_munmap(const void *, size_t);
 int	_dl_open(const char *, int);
 ssize_t	_dl_read(int, const char *, size_t);
-int	_dl_fstat(int, struct stat *);
-ssize_t	_dl_getdents(int, char *, size_t);
-int	_dl_sysctl(const int *, u_int, void *, size_t *, void *, size_t);
 ssize_t	_dl_readlink(const char *, char *, size_t);
 int	_dl_pledge(const char *, const char **);
-int	_dl___getcwd(char *, size_t);
+long	_dl___syscall(quad_t, ...);
+int	_dl_sysctl(const int *, u_int, void *, size_t *, void *, size_t);
 int	_dl_utrace(const char *, const void *, size_t);
 int	_dl_getentropy(char *, size_t);
 int	_dl_sendsyslog(const char *, size_t, int);
+void	_dl___set_tcb(void *);
 __dead
 void	_dl_thrkill(pid_t, int, void *);
 
diff --git a/libexec/ld.so/mips64/syscall.h b/libexec/ld.so/mips64/syscall.h
index e83c11e2316..f61f3f62ab6 100644
--- a/libexec/ld.so/mips64/syscall.h
+++ b/libexec/ld.so/mips64/syscall.h
@@ -1,7 +1,7 @@
-/*	$OpenBSD: syscall.h,v 1.28 2017/08/27 21:59:52 deraadt Exp $ */
+/*	$OpenBSD: syscall.h,v 1.29 2018/07/09 10:12:14 deraadt Exp $ */
 
 /*
- * Copyright (c) 1998-2002 Opsycon AB, Sweden.
+ * Copyright (c) 1998 Per Fogelstrom, Opsycon AB
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
@@ -25,11 +25,12 @@
  * SUCH DAMAGE.
  *
  */
+
 #ifndef __DL_SYSCALL_H__
 #define __DL_SYSCALL_H__
 
-#include <sys/stat.h>
 #include <sys/syscall.h>
+#include <sys/stat.h>
 
 #ifndef _dl_MAX_ERRNO
 #define _dl_MAX_ERRNO 512L
@@ -50,13 +51,13 @@ int	_dl_munmap(const void *, size_t);
 int	_dl_open(const char *, int);
 ssize_t	_dl_read(int, const char *, size_t);
 ssize_t	_dl_readlink(const char *, char *, size_t);
-void	_dl___set_tcb(void *);
 int	_dl_pledge(const char *, const char **);
 long	_dl___syscall(quad_t, ...);
 int	_dl_sysctl(const int *, u_int, void *, size_t *, void *, size_t);
 int	_dl_utrace(const char *, const void *, size_t);
 int	_dl_getentropy(char *, size_t);
 int	_dl_sendsyslog(const char *, size_t, int);
+void	_dl___set_tcb(void *);
 __dead
 void	_dl_thrkill(pid_t, int, void *);
 
diff --git a/libexec/ld.so/powerpc/syscall.h b/libexec/ld.so/powerpc/syscall.h
index 611017ca05d..ed17287b743 100644
--- a/libexec/ld.so/powerpc/syscall.h
+++ b/libexec/ld.so/powerpc/syscall.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: syscall.h,v 1.45 2017/08/27 21:59:52 deraadt Exp $ */
+/*	$OpenBSD: syscall.h,v 1.46 2018/07/09 10:12:14 deraadt Exp $ */
 
 /*
  * Copyright (c) 1998 Per Fogelstrom, Opsycon AB
@@ -25,11 +25,12 @@
  * SUCH DAMAGE.
  *
  */
+
 #ifndef __DL_SYSCALL_H__
 #define __DL_SYSCALL_H__
 
-#include <sys/stat.h>
 #include <sys/syscall.h>
+#include <sys/stat.h>
 
 #ifndef _dl_MAX_ERRNO
 #define _dl_MAX_ERRNO 512L
@@ -54,7 +55,6 @@ int	_dl_pledge(const char *, const char **);
 long	_dl___syscall(quad_t, ...);
 int	_dl_sysctl(const int *, u_int, void *, size_t *, void *, size_t);
 int	_dl_utrace(const char *, const void *, size_t);
-ssize_t	_dl_write(int, const char *, size_t);
 int	_dl_getentropy(char *, size_t);
 int	_dl_sendsyslog(const char *, size_t, int);
 void	_dl___set_tcb(void *);
@@ -64,8 +64,8 @@ void	_dl_thrkill(pid_t, int, 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);
+	return (void *)_dl___syscall(SYS_mmap, addr, len, prot,
+	    flags, fd, 0, offset);
 }
 
 #endif /*__DL_SYSCALL_H__*/
diff --git a/libexec/ld.so/sh/syscall.h b/libexec/ld.so/sh/syscall.h
index 79ff012f0a8..bce92a07a83 100644
--- a/libexec/ld.so/sh/syscall.h
+++ b/libexec/ld.so/sh/syscall.h
@@ -1,7 +1,7 @@
-/*	$OpenBSD: syscall.h,v 1.25 2017/08/27 21:59:52 deraadt Exp $ */
+/*	$OpenBSD: syscall.h,v 1.26 2018/07/09 10:12:14 deraadt Exp $ */
 
 /*
- * Copyright (c) 2001 Niklas Hallqvist
+ * Copyright (c) 1998 Per Fogelstrom, Opsycon AB
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
@@ -41,22 +41,23 @@
 int	_dl_close(int);
 __dead
 void	_dl_exit(int);
+int	_dl_fstat(int, struct stat *);
+int	_dl___getcwd(char *, size_t);
+ssize_t	_dl_getdents(int, char *, size_t);
 int	_dl_issetugid(void);
 int	_dl_getthrid(void);
-long	_dl___syscall(quad_t, ...);
 int	_dl_mprotect(const void *, size_t, int);
 int	_dl_munmap(const void *, size_t);
 int	_dl_open(const char *, int);
 ssize_t	_dl_read(int, const char *, size_t);
-int	_dl_fstat(int, struct stat *);
-ssize_t	_dl_getdents(int, char *, size_t);
-int	_dl_sysctl(const int *, u_int, void *, size_t *, void *, size_t);
 ssize_t	_dl_readlink(const char *, char *, size_t);
 int	_dl_pledge(const char *, const char **);
-int	_dl___getcwd(char *, size_t);
+long	_dl___syscall(quad_t, ...);
+int	_dl_sysctl(const int *, u_int, void *, size_t *, void *, size_t);
 int	_dl_utrace(const char *, const void *, size_t);
 int	_dl_getentropy(char *, size_t);
 int	_dl_sendsyslog(const char *, size_t, int);
+void	_dl___set_tcb(void *);
 __dead
 void	_dl_thrkill(pid_t, int, void *);
 
diff --git a/libexec/ld.so/sparc64/syscall.h b/libexec/ld.so/sparc64/syscall.h
index 3de0ab1ef3e..bdd4e724ae1 100644
--- a/libexec/ld.so/sparc64/syscall.h
+++ b/libexec/ld.so/sparc64/syscall.h
@@ -1,7 +1,7 @@
-/*	$OpenBSD: syscall.h,v 1.38 2017/08/27 21:59:52 deraadt Exp $ */
+/*	$OpenBSD: syscall.h,v 1.39 2018/07/09 10:12:14 deraadt Exp $ */
 
 /*
- * Copyright (c) 2001 Niklas Hallqvist
+ * Copyright (c) 1998 Per Fogelstrom, Opsycon AB
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
@@ -41,22 +41,23 @@
 int	_dl_close(int);
 __dead
 void	_dl_exit(int);
+int	_dl_fstat(int, struct stat *);
+int	_dl___getcwd(char *, size_t);
+ssize_t	_dl_getdents(int, char *, size_t);
 int	_dl_issetugid(void);
 int	_dl_getthrid(void);
-long	_dl___syscall(quad_t, ...);
 int	_dl_mprotect(const void *, size_t, int);
 int	_dl_munmap(const void *, size_t);
 int	_dl_open(const char *, int);
 ssize_t	_dl_read(int, const char *, size_t);
-int	_dl_fstat(int, struct stat *);
-ssize_t	_dl_getdents(int, char *, size_t);
-int	_dl_sysctl(const int *, u_int, void *, size_t *, void *, size_t);
 ssize_t	_dl_readlink(const char *, char *, size_t);
 int	_dl_pledge(const char *, const char **);
-int	_dl___getcwd(char *, size_t);
+long	_dl___syscall(quad_t, ...);
+int	_dl_sysctl(const int *, u_int, void *, size_t *, void *, size_t);
 int	_dl_utrace(const char *, const void *, size_t);
 int	_dl_getentropy(char *, size_t);
 int	_dl_sendsyslog(const char *, size_t, int);
+void	_dl___set_tcb(void *);
 __dead
 void	_dl_thrkill(pid_t, int, void *);