summaryrefslogtreecommitdiff
path: root/arch
diff options
context:
space:
mode:
authorRich Felker <dalias@aerifal.cx>2011-02-15 14:39:02 -0500
committerRich Felker <dalias@aerifal.cx>2011-02-15 14:39:02 -0500
commit9b235e8374bfe15f73d470b4ad7d1c579fd9a71e (patch)
tree5957c33f52d8d5145b8a65562c6a3e2338a34c35 /arch
parent44460c6d1eb1233f6598229d787d179c095b053f (diff)
downloadmusl-9b235e8374bfe15f73d470b4ad7d1c579fd9a71e.tar.gz
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.
Diffstat (limited to 'arch')
-rw-r--r--arch/i386/syscall.h12
-rw-r--r--arch/x86_64/syscall.h12
2 files changed, 2 insertions, 22 deletions
diff --git a/arch/i386/syscall.h b/arch/i386/syscall.h
index c87401f3..ee871a9d 100644
--- 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 0b04b29e..cfaa790f 100644
--- 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(;;);