remove standalone syscall cruft

this was originally written for an early draft of the library where
non-standard functions would reside in a static library separate from
the shared libc.so, which would implement a pure standard. the idea
was not to depend on an implementation-dependent __syscall_ret
function in the main libc. but it turned out to be better to put
everything in a single library for both static and dynamic linking
uses, and thus the (incomplete) remnants of this feature were just
enlarging the source and binary.

diff --git a/arch/i386/syscall.h b/arch/i386/syscall.h
index c87401f34bb46fd9bd523d09772f8d392293ed05..ee871a9d4f0819549dff061eb9fe058d9276368b 100644 (file)
--- a/arch/i386/syscall.h
+++ b/arch/i386/syscall.h
@@ -7,17 +7,7 @@
 
 #define SYSCALL_SIGSET_SIZE 8
 
-#if defined(SYSCALL_STANDALONE)
-#include <errno.h>
-static inline long __syscall_ret(unsigned long r)
-{
-       if (r >= (unsigned long)-1 - 4096) {
-               errno = -(long)r;
-               return -1;
-       }
-       return (long)r;
-}
-#elif defined(SYSCALL_NORETURN)
+#if defined(SYSCALL_NORETURN)
 static inline long __syscall_ret(unsigned long r)
 {
        for(;;);

diff --git a/arch/x86_64/syscall.h b/arch/x86_64/syscall.h
index 0b04b29e267de0fb62bda4e95bec3ae2d58e2c8f..cfaa790fa0cd49b8bb3b23881ea18ee8866d4c41 100644 (file)
--- a/arch/x86_64/syscall.h
+++ b/arch/x86_64/syscall.h
@@ -4,17 +4,7 @@
 #define SYSCALL_LL(x) x, 0
 #define SYSCALL_SIGSET_SIZE 8
 
-#if defined(SYSCALL_STANDALONE)
-#include <errno.h>
-static inline long __syscall_ret(unsigned long r)
-{
-       if (r >= (unsigned long)-1 - 4096) {
-               errno = -(long)r;
-               return -1;
-       }
-       return (long)r;
-}
-#elif defined(SYSCALL_NORETURN)
+#if defined(SYSCALL_NORETURN)
 static inline long __syscall_ret(unsigned long r)
 {
        for(;;);

diff --git a/src/linux/chroot.c b/src/linux/chroot.c
index b5af62dcf3b8fe7241baae47c83ea28f5ce43efb..81363a6b48b2e157967531fcf6565d99c1261886 100644 (file)
--- a/src/linux/chroot.c
+++ b/src/linux/chroot.c
@@ -1,5 +1,4 @@
 #include <unistd.h>
-#define SYSCALL_STANDALONE
 #include "syscall.h"
 
 int chroot(const char *path)

diff --git a/src/linux/klogctl.c b/src/linux/klogctl.c
index 6c288aff2b9212fa6656fcea71c5b79b23266d24..976f29e3887b6ebf605bea6b5ad251a1f5b26ddd 100644 (file)
--- a/src/linux/klogctl.c
+++ b/src/linux/klogctl.c
@@ -1,4 +1,3 @@
-#define SYSCALL_STANDALONE
 #include "syscall.h"
 
 int klogctl (int type, char *buf, int len)

diff --git a/src/linux/mount.c b/src/linux/mount.c
index 61299d482c5e8a11a624b7bd600b117e12cb47d4..8e3cc122ea4a7e9d85397c6916bb59304376da4a 100644 (file)
--- a/src/linux/mount.c
+++ b/src/linux/mount.c
@@ -1,5 +1,4 @@
 #include <sys/mount.h>
-#define SYSCALL_STANDALONE
 #include "syscall.h"
 
 int mount(const char *special, const char *dir, const char *fstype, unsigned long flags, const void *data)

diff --git a/src/linux/sethostname.c b/src/linux/sethostname.c
index f61e0cb4e5d38b2a74ecc3565602c8b2b939eadb..c94325e605f5e4da4a78217de2aaf06fe7ea8a58 100644 (file)
--- a/src/linux/sethostname.c
+++ b/src/linux/sethostname.c
@@ -1,5 +1,4 @@
 #include <unistd.h>
-#define SYSCALL_STANDALONE
 #include "syscall.h"
 
 int sethostname(const char *name, size_t len)

diff --git a/src/linux/swapoff.c b/src/linux/swapoff.c
index f6fa794eee2d07bcdf6a5285df608f660c3d4061..4f19823fc1a0ca171ecad924e3e4733a549c7aa0 100644 (file)
--- a/src/linux/swapoff.c
+++ b/src/linux/swapoff.c
@@ -1,5 +1,4 @@
 #include <sys/swap.h>
-#define SYSCALL_STANDALONE
 #include "syscall.h"
 
 int swapoff(const char *path)

diff --git a/src/linux/swapon.c b/src/linux/swapon.c
index 13d2876bd01ebe400f3faee269c7d0300e79db82..5c75247fcb30e283efd9b20f4de5863334903ba6 100644 (file)
--- a/src/linux/swapon.c
+++ b/src/linux/swapon.c
@@ -1,5 +1,4 @@
 #include <sys/swap.h>
-#define SYSCALL_STANDALONE
 #include "syscall.h"
 
 int swapon(const char *path, int flags)

diff --git a/src/linux/sysinfo.c b/src/linux/sysinfo.c
index 986694724b133eab407c59aa017702b3c74a90c5..c61b7aa8c4432c4bc5f3ba6a9e12194b6033da71 100644 (file)
--- a/src/linux/sysinfo.c
+++ b/src/linux/sysinfo.c
@@ -1,4 +1,3 @@
-#define SYSCALL_STANDALONE
 #include "syscall.h"
 
 struct sysinfo;

diff --git a/src/linux/utimes.c b/src/linux/utimes.c
index 99a3b2b852007da0bbabf4c1b4e0b032eb49b171..59ee1a81a811c542dcd4f0aca9127836c34c3c76 100644 (file)
--- a/src/linux/utimes.c
+++ b/src/linux/utimes.c
@@ -1,5 +1,4 @@
 #include <sys/time.h>
-#define SYSCALL_STANDALONE
 #include "syscall.h"
 
 int utimes(const char *path, const struct timeval times[2])

diff --git a/src/linux/wait3.c b/src/linux/wait3.c
index dd63707c42f7b5831a3887ba9d7c998bd0f86562..d1d91b055db53d4b6032ee890170dcbac9d56c07 100644 (file)
--- a/src/linux/wait3.c
+++ b/src/linux/wait3.c
@@ -1,6 +1,5 @@
 #include <sys/wait.h>
 #include <sys/resource.h>
-#define SYSCALL_STANDALONE
 #include "syscall.h"
 
 pid_t wait4(pid_t, int *, int, struct rusage *);

diff --git a/src/linux/wait4.c b/src/linux/wait4.c
index dda942d38fbcdfe3407fdf07de0e403b2973958c..5dd505a987c0a764e9482e718081300a2e64e774 100644 (file)
--- a/src/linux/wait4.c
+++ b/src/linux/wait4.c
@@ -1,7 +1,6 @@
 #include <sys/wait.h>
 #include <sys/resource.h>
 #include <string.h>
-#define SYSCALL_STANDALONE
 #include "syscall.h"
 
 pid_t wait4(pid_t pid, int *status, int options, struct rusage *usage)