From 6278781655261a5011376b2fa2600996e32ca889 Mon Sep 17 00:00:00 2001 From: Eric Andersen Date: Fri, 6 Apr 2001 20:28:45 +0000 Subject: Fix include/errno.h to not use kernel header, and instead use bits/errno.h. This required we use _LIBC instead of __LIBC__ to be consistent with glibc. This had some sideffects in sys/syscalls.h. While fixing things, I made everything use __set_errno() for (eventual) thread support. -Erik --- libc/sysdeps/linux/i386/__init_brk.c | 6 +++--- libc/sysdeps/linux/i386/brk.c | 6 +++--- libc/sysdeps/linux/i386/sbrk.c | 6 +++--- 3 files changed, 9 insertions(+), 9 deletions(-) (limited to 'libc/sysdeps/linux/i386') diff --git a/libc/sysdeps/linux/i386/__init_brk.c b/libc/sysdeps/linux/i386/__init_brk.c index c2ae482dd..4d9746342 100644 --- a/libc/sysdeps/linux/i386/__init_brk.c +++ b/libc/sysdeps/linux/i386/__init_brk.c @@ -17,15 +17,15 @@ __init_brk () "int $0x80\n\t" "popl %%ebx" :"=a" (___brk_addr) - :"0" (SYS_brk)); + :"0" (__NR_brk)); #else __asm__ volatile ("int $0x80" :"=a" (___brk_addr) - :"0" (SYS_brk),"b" (0)); + :"0" (__NR_brk),"b" (0)); #endif if (___brk_addr == 0) { - errno = ENOMEM; + __set_errno(ENOMEM); return -1; } } diff --git a/libc/sysdeps/linux/i386/brk.c b/libc/sysdeps/linux/i386/brk.c index 2a776bac1..9e06d0acc 100644 --- a/libc/sysdeps/linux/i386/brk.c +++ b/libc/sysdeps/linux/i386/brk.c @@ -18,15 +18,15 @@ int brk(void * end_data_seg) "int $0x80\n\t" "popl %%ebx" :"=a" (___brk_addr) - :"0" (SYS_brk),"c" (end_data_seg)); + :"0" (__NR_brk),"c" (end_data_seg)); #else __asm__ volatile ("int $0x80" :"=a" (___brk_addr) - :"0" (SYS_brk),"b" (end_data_seg)); + :"0" (__NR_brk),"b" (end_data_seg)); #endif if (___brk_addr == end_data_seg) return 0; - errno = ENOMEM; + __set_errno(ENOMEM); } return -1; } diff --git a/libc/sysdeps/linux/i386/sbrk.c b/libc/sysdeps/linux/i386/sbrk.c index f5099d7e8..ca987aa8c 100644 --- a/libc/sysdeps/linux/i386/sbrk.c +++ b/libc/sysdeps/linux/i386/sbrk.c @@ -20,15 +20,15 @@ sbrk(ptrdiff_t increment) "int $0x80\n\t" "popl %%ebx" :"=a" (___brk_addr) - :"0" (SYS_brk),"c" (tmp)); + :"0" (__NR_brk),"c" (tmp)); #else __asm__ volatile ("int $0x80" :"=a" (___brk_addr) - :"0" (SYS_brk),"b" (tmp)); + :"0" (__NR_brk),"b" (tmp)); #endif if (___brk_addr == tmp) return tmp-increment; - errno = ENOMEM; + __set_errno(ENOMEM); return ((void *) -1); } return ((void *) -1); -- cgit v1.2.3